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

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

app/models/research/journal/article.rb

app/models/research/journal/volume.rb

app/models/research/researcher.rb

app/models/user.rb

app/models/user/with_avatar.rb

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

...iews/admin/communication/website/categories/show.html.erb

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

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

app/views/admin/research/journal/articles/_form.html.erb

app/views/admin/research/journal/articles/show.html.erb

app/views/admin/research/journal/volumes/_form.html.erb

app/views/admin/research/journal/volumes/show.html.erb

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

app/views/admin/research/researchers/jekyll.html.erb

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

app/views/admin/users/show.html.erb

config/locales/research/en.yml

config/locales/research/fr.yml