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

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