Merge branch 'hal' of github.com:noesya/osuny into hal

app/assets/javascripts/application/plugins/summernote.js

app/assets/javascripts/vue.js

app/assets/javascripts/vue/direct-upload-controller.js

...controllers/admin/research/journals/volumes_controller.rb

app/controllers/admin/research/journals_controller.rb

app/controllers/application_controller/with_locale.rb

app/controllers/server/languages_controller.rb

app/models/communication/website/category.rb

app/models/communication/website/page.rb

app/models/concerns/with_featured_image.rb

app/models/education/program.rb

app/models/language.rb

app/models/research/journal.rb

app/models/research/journal/volume.rb

app/views/admin/application/featured_image/_show.html.erb

app/views/admin/application/featured_image/_static.html.erb

app/views/admin/communication/blocks/edit.html.erb

app/views/admin/communication/unsplash/_static.html.erb

...s/admin/communication/websites/categories/static.html.erb

app/views/admin/communication/websites/pages/static.html.erb