Trying to fix some problem with registration
Merge branch 'fix/registration'

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Controller/Admin/UserController.php