Merge branch 'master' of github.com:noesya/osuny

app/controllers/admin/research/application_controller.rb

app/controllers/admin/research/laboratories_controller.rb

...llers/admin/research/laboratory/application_controller.rb

app/controllers/admin/research/laboratory/axes_controller.rb

app/controllers/admin/research/theses_controller.rb

app/models/research/laboratory.rb

app/models/research/laboratory/axis.rb

app/models/research/thesis.rb

app/models/university/with_research.rb

app/views/admin/research/laboratories/show.html.erb

app/views/admin/research/laboratory/axes/_form.html.erb

app/views/admin/research/laboratory/axes/_list.html.erb

app/views/admin/research/laboratory/axes/edit.html.erb

app/views/admin/research/laboratory/axes/index.html.erb

app/views/admin/research/laboratory/axes/new.html.erb

app/views/admin/research/laboratory/axes/show.html.erb

app/views/admin/research/theses/_form.html.erb

app/views/admin/research/theses/edit.html.erb

app/views/admin/research/theses/index.html.erb

app/views/admin/research/theses/new.html.erb