Merge branch 'master' into 357-cloisonnement-extranets

Gemfile

Gemfile.lock

app/assets/stylesheets/admin/treeview.sass

app/assets/stylesheets/commons/_block.sass

app/controllers/admin/communication/unsplash_controller.rb

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

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

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

app/controllers/admin/education/programs_controller.rb

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

app/models/communication/block/template/page.rb

app/models/communication/block/template/post.rb

app/models/communication/website/category.rb

app/models/communication/website/index_page.rb

app/models/communication/website/page.rb

app/models/communication/website/post.rb

app/models/communication/website/with_special_pages.rb

app/models/concerns/with_featured_image.rb

app/models/education/program.rb

app/models/research/journal/volume.rb