Merge branch 'master' into features/previews

Gemfile.lock

app/assets/images/communication/blocks/templates/contact.jpg

...assets/images/communication/blocks/templates/programs.jpg

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

...dmin/communication/websites/posts/curations_controller.rb

app/controllers/admin/education/diplomas_controller.rb

app/controllers/admin/education/programs_controller.rb

...rollers/admin/university/alumni/experiences_controller.rb

app/controllers/admin/university/people_controller.rb

app/models/ability.rb

app/models/communication/block.rb

app/models/communication/block/component/program.rb

app/models/communication/block/component/time_slot.rb

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

app/models/communication/block/template/contact/element.rb

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

app/models/communication/block/template/program/element.rb

app/models/communication/website/page.rb

app/models/communication/website/with_style.rb

app/models/education/diploma.rb