Salut
fMerge branch 'master' of https://github.com/Gerome54520/ProjetWebSujet2

Conflicts:
	app/Resources/views/layout.html.twig
	app/cache/dev/annotations/Sujet2-DevSpeBundle-Entity-AdminRepository.cache.php
	app/cache/dev/annotations/Sujet2-DevSpeBundle-Entity-DocumentsRepository.cache.php
	app/cache/dev/annotations/Symfony-Bundle-WebProfilerBundle-Controller-ProfilerController#toolbarAction.cache.php~7b160890c23327ebb462a8a50dbf4f283bf22bb5_0
	app/cache/dev/annotations/Symfony-Bundle-WebProfilerBundle-Controller-ProfilerController#toolbarAction.cache.php~HEAD
	app/cache/dev/annotations/Symfony-Bundle-WebProfilerBundle-Controller-ProfilerController#toolbarAction.cache.php~HEAD_0
	app/cache/dev/annotations/Symfony-Bundle-WebProfilerBundle-Controller-ProfilerController.cache.php~7b160890c23327ebb462a8a50dbf4f283bf22bb5
	app/cache/prod/annotations/Acme-SecurityBundle-Controller-SecurityController#loginAction.cache.php
	app/cache/prod/annotations/Acme-SecurityBundle-Controller-SecurityController.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#adresse_enseignantAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#etatvoeuxAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#visualisersessionAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#voeux_enseignantAction.cache.php
	app/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.php.meta
	app/cache/prod/appProdDebugProjectContainer.xml
	app/cache/prod/appProdDebugProjectContainerCompiler.log
	app/cache/prod/appProdUrlGenerator.php.meta
	app/cache/prod/appProdUrlMatcher.php.meta
	app/config/parameters.yml
	app/config/routing.yml
	app/logs/dev.log
	app/logs/prod.log
	src/Acme/SecurityBundle/Resources/config/doctrine/user.orm.yml
	src/FOS/UserBundle/Resources/views/Security/login.html.twig
	src/Sujet2/DevSpeBundle/Form/EnseignantTypeAdresse.php
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/MenuEnseignant.html.twig
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/adresse_enseignant.html.twig
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/formulaire_adresse_enseignant.html.twig
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/profilenseignant.html.twig
 Commit Gerome ninfini