xxxx
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Resources/views/layout_club.html.twig
Merge branch 'master' of https://github.com/BewBa/Opt2

Conflicts:
	src/FrontOffice/OptimusBundle/Resources/views/layout_club.html.twig