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

app/controllers/admin/communication/extranets_controller.rb

...ers/admin/communication/website/index_pages_controller.rb

...ntrollers/admin/communication/website/pages_controller.rb

...controllers/admin/research/journal/articles_controller.rb

app/controllers/admin/research/journal/volumes_controller.rb

app/models/ability.rb

app/models/communication/extranet.rb

app/models/communication/website.rb

app/models/communication/website/category.rb

app/models/communication/website/index_page.rb

...models/communication/website/index_page/administrators.rb

app/models/communication/website/index_page/authors.rb

...s/communication/website/index_page/communication_posts.rb

...ls/communication/website/index_page/education_programs.rb

app/models/communication/website/index_page/home.rb

app/models/communication/website/index_page/persons.rb

...els/communication/website/index_page/research_articles.rb

...dels/communication/website/index_page/research_volumes.rb

app/models/communication/website/index_page/researchers.rb

app/models/communication/website/index_page/teachers.rb