Update composer.json
Fix json
fix composer.json
Merge remote-tracking branch 'refs/remotes/sonata/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master

Conflicts:
	composer.json
Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master' into 2.1

Conflicts:
	composer.json