Update block to work with the BlockBundle
Merge branch 'sonata/master'

Conflicts:
	composer.json