Friends without design
friend
Merge branch 'master' into fRiend

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Controller/Front/UserController.php
	src/BionicUniversity/Bundle/UserBundle/Resources/config/routing/front/user.yml
Merge branch 'fRiend'