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

app/assets/javascripts/admin/notyf.js

app/controllers/admin/application_controller.rb

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

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

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/education/programs_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/controllers/admin/users_controller.rb

app/controllers/server/application_controller.rb

app/controllers/server/dashboard_controller.rb

app/controllers/server/languages_controller.rb

app/controllers/server/universities_controller.rb

config/locales/en.yml

config/locales/fr.yml

config/server_navigation.rb