merge

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

...ets/images/communication/blocks/templates/agenda/grid.png

...ets/images/communication/blocks/templates/agenda/list.png

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

app/controllers/admin/communication/websites_controller.rb

app/models/ability/admin.rb

app/models/communication/block.rb

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

app/models/communication/website.rb

app/models/communication/website/agenda/event.rb

app/models/communication/website/category.rb

app/models/communication/website/imported.rb

app/models/communication/website/imported/author.rb

app/models/communication/website/imported/category.rb

app/models/communication/website/imported/medium.rb

app/models/communication/website/imported/page.rb

app/models/communication/website/imported/post.rb

app/models/communication/website/imported/website.rb

...els/communication/website/imported/with_featured_image.rb

app/models/communication/website/page.rb