Event Bundle
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.lock
	src/PlanIt/UserBundle/Resources/views/Page/event.html.twig