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

Conflicts:
	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
	app/cache/dev/annotations/Symfony-Bundle-WebProfilerBundle-Controller-ProfilerController.cache.php
	app/cache/dev/twig/f3/3a/7ebd8526704972f8e08057619968.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#accueilAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#accueilensAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#accueilgesAction.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#phase2Action.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#profilensAction.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/annotations/Sujet2-DevSpeBundle-Controller-MoulinetteController#choixfichierAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-MoulinetteController.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getAbsolutePath.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getId.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getPath.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getType.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getUploadDir.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getUploadRootDir.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#getWebPath.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#setPath.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#setType.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Documents#upload.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#__construct.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#addContrainte.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#getContraintes.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#getDistMax.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#getId.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#getLibelle.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#getTolerance.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#removeContrainte.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#setDistMax.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#setLibelle.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Parametre#setTolerance.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/cache/prod/classes.php
	app/cache/prod/classes.php.meta
	app/cache/prod/twig/08/79/b243e79ca6e161acb0b75735b0cf.php
	app/cache/prod/twig/0a/1c/d802f8bea75b62ef48cab6676e5a.php
	app/cache/prod/twig/0a/1c/d802f8bea75b62ef48cab6676e5a.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/0a/1c/d802f8bea75b62ef48cab6676e5a.php~cd03383123d96e913a477ceeb77654f5af76cefe
	app/cache/prod/twig/0c/25/554d93b31b57805924dafe3d49ce.php
	app/cache/prod/twig/0f/6f/14cb72bc3a16e80de12639705d8c.php
	app/cache/prod/twig/56/57/3773a96ea41d21e112a6c062eb6e.php
	app/cache/prod/twig/77/78/4898f3cff90cfad12b28f711c127.php
	app/cache/prod/twig/7a/ed/22815b55c2ae810c7bf04cdec599.php
	app/cache/prod/twig/7b/4a/27903125144ce67719e3112a06a3.php
	app/cache/prod/twig/7d/33/b10f8d58ba7622120a8ec7ee3687.php
	app/cache/prod/twig/89/64/18a375e0963f02bc551c6f99d721.php
	app/cache/prod/twig/8d/4e/5756764b601eeb429da5edb88259.php
	app/cache/prod/twig/8f/e1/46b64324f0cc0bb6e0124020c5bc.php
	app/cache/prod/twig/94/8a/55997d425b942ce26e6924eaad92.php
	app/cache/prod/twig/9b/9b/d14ab8fc0a84cc5270cd6ce20c43.php
	app/cache/prod/twig/9f/e1/dd4da1c106ce855745f08f801af8.php
	app/cache/prod/twig/a9/60/31197446b0ed22df9acb0910496b.php
	app/cache/prod/twig/d2/db/6e5ae86a543caa1a05bd78a08014.php
	app/cache/prod/twig/d9/a5/9779930f59103fdb3883d4282fb2.php
	app/cache/prod/twig/de/2d/a31753aabb3f9a92a264ac960af5.php
	app/cache/prod/twig/e0/1a/e50b5f907de2e4a1a963085d2b40.php
	app/cache/prod/twig/e6/49/96ac78a1009b15bcb99910fa3bb1.php
	app/cache/prod/twig/f3/3a/7ebd8526704972f8e08057619968.php
	app/config/parameters.yml
	app/logs/prod.log
	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