8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Entity/Club.php
	src/FrontOffice/UserBundle/Controller/UserController.php
Merge branch 'master' of https://github.com/BewBa/Opt2