Merge branch 'master' into simplify_folders

Gemfile

Gemfile.lock

app/assets/stylesheets/commons/_block.sass

app/controllers/admin/communication/unsplash_controller.rb

...ers/admin/communication/websites/categories_controller.rb

...trollers/admin/communication/websites/pages_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

app/controllers/admin/education/programs_controller.rb

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

app/controllers/extranet/academic_years_controller.rb

app/controllers/extranet/cohorts_controller.rb

app/controllers/extranet/home_controller.rb

app/controllers/extranet/organizations_controller.rb

app/controllers/extranet/persons_controller.rb

app/models/communication/website/category.rb

app/models/communication/website/page.rb

app/models/communication/website/post.rb

app/models/concerns/with_featured_image.rb

app/models/education/program.rb

app/models/education/school.rb