a
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/UserBundle/Controller/UserController.php