Fix for https://github.com/sonata-project/SonataBlockBundle/issues/53
Update dependencies
Update composer.json
update composer.json
Merge pull request #190 from Lexance/master

Partitial fix for https://github.com/sonata-project/SonataBlockBundle/issues/53
Merge branch 'origin/2.2'
Merge branch 'sonata/master'

Conflicts:
	composer.json
Merge branch 'origin/master'