Add listener and edit template
Merge branch 'User-Bundle'

Conflicts:
	app/config/config.yml
	src/Pfe/Bundle/PageBundle/Controller/Frontend/PageController.php