update composer.json
Fix #357
Merge remote-tracking branch 'sonata-project/master'

Conflicts:
	composer.json