doctrine en commentaire
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PlanIt/UserBundle/Controller/PageController.php