Update composer.json
fix composer.json
Update sonata_block.yml

add missing end line ...
update composer.lock
Update composer.lock
tweak configuration
Update composer.lock
Merge branch 'sonata/2.1'