Fix composer.json to work on travis
Merge remote-tracking branch 'sonata-project/master'

Conflicts:
	composer.json