Merge origin/master

Conflicts:
	app/cache/dev/twig/ce/d0/b1025ca15647e4ae1c20e2a0aba055542bda09b34d88fa1161bf8cd9fd25.php
	src/FrontOffice/UserBundle/Controller/PageController.php