fixed composer for packigist
replace dependency
fixed composer error
Merge branch 'refs/heads/sonata-master' into rmzamora-sonata-merge

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