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

Conflicts:
	app/Resources/js/scripts.js
	app/Resources/views/base.html.twig
	src/PlanIt/EventBundle/Resources/views/layout.html.twig
	src/PlanIt/UserBundle/Resources/views/layout.html.twig
de la crotte
Bug
Variable qui bugait