Commit de merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PlanIt/UserBundle/Resources/views/layout.html.twig