Merge blocks

...ets/images/communication/blocks/templates/definitions.jpg

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

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

app/models/communication/block.rb

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

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

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

...communication/blocks/templates/definitions/_edit.html.erb

...communication/blocks/templates/definitions/_show.html.erb

...mmunication/blocks/templates/definitions/_static.html.erb

.../admin/communication/blocks/templates/push/_edit.html.erb

.../admin/communication/blocks/templates/push/_show.html.erb

...dmin/communication/blocks/templates/push/_static.html.erb

...in/communication/blocks/templates/timeline/_edit.html.erb

...in/communication/blocks/templates/timeline/_show.html.erb

.../communication/blocks/templates/timeline/_static.html.erb

config/locales/communication/en.yml

config/locales/communication/fr.yml