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

...rs/admin/communication/websites/application_controller.rb

...ollers/admin/communication/websites/authors_controller.rb

...ers/admin/communication/websites/categories_controller.rb

...rs/admin/communication/websites/menus/items_controller.rb

...trollers/admin/communication/websites/menus_controller.rb

...trollers/admin/communication/websites/pages_controller.rb

...dmin/communication/websites/posts/curations_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

...ollers/admin/education/programs/application_controller.rb

...ollers/admin/education/programs/role/people_controller.rb

app/controllers/admin/education/programs/roles_controller.rb

...ntrollers/admin/education/programs/teachers_controller.rb

...rollers/admin/education/schools/application_controller.rb

...ollers/admin/education/schools/roles/people_controller.rb

app/controllers/admin/education/schools/roles_controller.rb

...rollers/admin/research/journals/application_controller.rb

...ontrollers/admin/research/journals/articles_controller.rb

...controllers/admin/research/journals/volumes_controller.rb

...ers/admin/research/laboratories/application_controller.rb

...ontrollers/admin/research/laboratories/axes_controller.rb