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

...rollers/admin/communication/website/authors_controller.rb

...lers/admin/communication/website/categories_controller.rb

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

...ntrollers/admin/communication/website/posts_controller.rb

app/controllers/admin/communication/websites_controller.rb

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

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

app/controllers/admin/research/journals_controller.rb

app/controllers/admin/research/researchers_controller.rb

app/models/communication/website/author.rb

app/models/communication/website/category.rb

app/models/communication/website/post.rb

app/models/research/journal.rb

app/models/research/journal/article.rb

app/models/research/researcher.rb

app/models/university/with_research.rb

app/views/admin/communication/website/authors/_form.html.erb

...views/admin/communication/website/authors/jekyll.html.erb

app/views/admin/communication/website/authors/show.html.erb

...ews/admin/communication/website/categories/_form.html.erb