Merge branch 'master' into media-endpoint

app/assets/javascripts/admin.js

app/assets/javascripts/admin/commons/user_menu.js

app/assets/javascripts/admin/communication/init.js

app/assets/javascripts/admin/communication/menu_items.js

app/assets/javascripts/admin/plugins/notyf.js

app/assets/javascripts/admin/plugins/sortable.js

app/assets/javascripts/admin/plugins/treeview.js

app/assets/javascripts/application.js

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

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

...lers/admin/communication/website/menu/items_controller.rb

...ntrollers/admin/communication/website/menus_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.rb