replace dependency
fixed composer error
fixed composer error
Merge remote-tracking branch 'refs/remotes/origin/master' into sonata-rmzamora-merge

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