ccc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Controller/PostController.php
	src/FrontOffice/OptimusBundle/Entity/Event.php
	src/FrontOffice/OptimusBundle/Entity/Post.php