Commit gerome
Merge branch 'master' of https://github.com/Gerome54520/ProjetWebSujet2

Conflicts:
	app/Resources/views/layout.html.twig
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/routing.yml
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.xml
	app/cache/prod/classes.php.meta
	app/cache/prod/sessions/sess_uv325hph79su0oqrht885li1h0
	app/config/routing.yml
	app/logs/dev.log
	app/logs/prod.log
	src/Acme/SecurityBundle/Entity/User.php
	src/Sujet2/DevSpeBundle/Entity/SessionUt.php
	src/Sujet2/DevSpeBundle/Form/SessionUtType.php
	src/Sujet2/DevSpeBundle/Moulinette.php
	src/Sujet2/DevSpeBundle/Resources/config/routing.yml
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/formulaire_phase1.html.twig