Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Controller/HistoryClubController.php
	src/FrontOffice/OptimusBundle/Controller/HistoryEventController.php

history log event&club