Update composer.json
Merge branch 'sonata-project/master'

Conflicts:
	composer.json