replace dependency
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master

Conflicts:
	composer.json
pointed to rmzamora package
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master
refactored profile form to use FOSUserBundle Events
update composer.json to use the dev-master branch
Merge remote-tracking branch 'refs/remotes/origin/form-event-fix' into rmzamora-master

Conflicts:
	composer.json
fixed composer.json
fixed composer.json
fixed composer.json
fixed composer.json
fixed composer.json
fixed missing loginAction parameter "Request"
Merge remote-tracking branch 'refs/remotes/origin/form-event-fix' into rmzamora-master
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master

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

Conflicts:
	composer.json