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