Update composer.json
Merge branch 'sonata/master'

Conflicts:
	composer.json