commit gael partie enseignant
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/dev/sessions/sess_ip2removubqisgm1qeorb5nd21
	app/cache/dev/twig/01/85/9b00eaef6305d6e1c6ae29d7e7ff.php
	app/cache/dev/twig/01/b9/4ab4c35f26f318b8e304cf60f04c.php
	app/cache/dev/twig/02/4c/2accc8427a5abdd8907b0956b337.php
	app/cache/dev/twig/04/98/ac3a9b71d1c48c45b0741e05014a.php
	app/cache/dev/twig/0c/a3/579c21ed50a0425167fa4cc18b0e.php
	app/cache/dev/twig/15/61/78a5e0d6d50d04e3b0e0d0154488.php
	app/cache/dev/twig/18/5a/4483382a4bb8d6846494569c5447.php
	app/cache/dev/twig/1d/70/df577c9ea73ea2da66083c1e94e5.php
	app/cache/dev/twig/27/dc/999870612e125e25fa8199ad6a1c.php
	app/cache/dev/twig/29/4e/e513ecd5fc65a9b656c1a4244dce.php
	app/cache/dev/twig/2e/e4/07a7227f93163ab9106b5ff2f6ee.php
	app/cache/dev/twig/30/47/4fa0f30b28e8f7d09425ce94f51c.php
	app/cache/dev/twig/33/f2/4a1a680a0a4b6f9f220c69cb0013.php
	app/cache/dev/twig/3b/58/02a3399f5de16ba1db5df728480c.php
	app/cache/dev/twig/3b/65/13c3668d770d2f03040af199d026.php
	app/cache/dev/twig/42/6a/efdb62605c225ffc33328b195f7b.php
	app/cache/dev/twig/45/1c/019d6fe32120fb540c5bd92fff83.php
	app/cache/dev/twig/46/43/33cd5bc3330ee68b00eadc2c9d2f.php
	app/cache/dev/twig/47/a6/1e73eae281fba75e86d243c22085.php
	app/cache/dev/twig/4b/18/1df8026b998f5f0c303e5a85711d.php
	app/cache/dev/twig/4d/de/8daac52cf0ea5d0bb4f673a3abbe.php
	app/cache/dev/twig/52/7b/15446c2c045a34efc3d62ec26dfc.php
	app/cache/dev/twig/53/0c/daadaa3915b9493c8307c4b8849d.php
	app/cache/dev/twig/56/42/bfd806f5c82fafe959d412d381ab.php
	app/cache/dev/twig/59/af/54b878b97f3893d4d9f2a25b2d47.php
	app/cache/dev/twig/5f/ed/042ef4f5d0a7623d32a568b46d75.php
	app/cache/dev/twig/60/66/f3529985c6deca256817d42c5fab.php
	app/cache/dev/twig/61/b4/da667e5bee8b2b2f315761fe5be4.php
	app/cache/dev/twig/62/a5/d0389b10f3d9fe97c2673cc000d2.php
	app/cache/dev/twig/62/c9/ce12e6b4e9b390716e439f8ee609.php
	app/cache/dev/twig/64/14/f9605605fda723a9b50726d2198e.php
	app/cache/dev/twig/65/0e/3441966a1148d4ee1f86786b4a09.php
	app/cache/dev/twig/72/20/bdc860f22e18aac1d301ca5f07a2.php
	app/cache/dev/twig/73/82/e7d0b91eb8eb7c0f4a7b70f1ebe6.php
	app/cache/dev/twig/82/8e/64c8263fee4f6b55da901ffde0f4.php
	app/cache/dev/twig/8c/cf/5cfd653e90dc7d40345004f43ca0.php
	app/cache/dev/twig/98/25/9979efa185eb6b407f8847c538f8.php
	app/cache/dev/twig/99/20/7c4e03e6053b637e09ed520180d3.php
	app/cache/dev/twig/9d/51/e5b820fe27aed3bc12cb5551beb9.php
	app/cache/dev/twig/a0/9b/eaafaed532e1d67e4b80a42719a9.php
	app/cache/dev/twig/a4/9d/8e25bc9cd6cdc4e208b66125ffb3.php
	app/cache/dev/twig/a5/62/f7846630ba1aa46410baf52890e1.php
	app/cache/dev/twig/a7/0a/37bc27c2b0b6af6d7bbe489e3196.php
	app/cache/dev/twig/a9/35/3dfed2203137d3ae463a027de77b.php
	app/cache/dev/twig/aa/97/e766cf6257cd3508c6595322caa0.php
	app/cache/dev/twig/ab/e9/245e216ae3aa103f042b3a3169c5.php
	app/cache/dev/twig/b5/5d/75130503db8c3d1218c4a82b4357.php
	app/cache/dev/twig/b8/9b/dea7701a41655a582c00a7bcc316.php
	app/cache/dev/twig/bc/8e/64f7ad6699309364983fdb24e263.php
	app/cache/dev/twig/bd/ea/ee922a3c6f1d72f95ad16cfd3478.php
	app/cache/dev/twig/be/a8/30d28ee4b382cd596d82ac862dfe.php
	app/cache/dev/twig/c0/bf/b6745e5936b9d5a8c4ce9f81dc51.php
	app/cache/dev/twig/ca/1d/ae213f90792636d9dbce4eef9fde.php
	app/cache/dev/twig/ca/72/0ef933102a890651669192ea694b.php
	app/cache/dev/twig/cb/04/6e1cf81a7f3421d35c9bf93ee661.php
	app/cache/dev/twig/cd/f8/2bda06217c5b1a5cdb9fbe2d671d.php
	app/cache/dev/twig/cf/97/c1e05fd614ec59c202547f1f71aa.php
	app/cache/dev/twig/d0/92/00736bd21d980b91614b3883c7dd.php
	app/cache/dev/twig/d4/43/629a757743e46c8e422a9f37f037.php
	app/cache/dev/twig/d8/4d/e6d90daefa19b3c52de7d1d9fe47.php
	app/cache/dev/twig/d8/d7/ca0c58eb5a29a2e151b89ae75625.php
	app/cache/dev/twig/d9/dc/e66266677733eb87831d6d2336f5.php
	app/cache/dev/twig/da/a7/b26131c6cd731f20021ed1b94b25.php
	app/cache/dev/twig/dc/da/3435461ad5810ddfb629c1acba77.php
	app/cache/dev/twig/de/3c/6e5067d6d873d654538db16a6b13.php
	app/cache/dev/twig/e4/ea/44d3bb0b143499425cf456b13b2a.php
	app/cache/dev/twig/e7/f5/f7915c019c91420c826d0fe996c5.php
	app/cache/dev/twig/e9/cf/c724d65274b59f8e0dcd6b1fe842.php
	app/cache/dev/twig/ef/5f/d8ce32bb23445d15ceb4670861bd.php
	app/cache/dev/twig/f3/3a/7ebd8526704972f8e08057619968.php
	app/cache/dev/twig/f5/9f/421f89eda3084c6a2587ff0e2dc4.php
	app/cache/dev/twig/f8/db/ef85e579cdea530031308068e700.php
	app/cache/dev/twig/fa/52/afbddf942b170da12f18a2339da1.php
	app/cache/dev/twig/fa/b6/596fb1ed97caf59abbfb060be058.php
	app/cache/dev/twig/fb/0d/cda6579a075b84fddeebb5353439.php
	app/cache/dev/twig/fd/59/4def82bf603b23337cae36607f3d.php
	app/cache/dev/twig/fe/82/7fd636969ceb56e0ef83705b28d8.php
	app/cache/dev/twig/ff/8d/1f964ca3aebae988c6291518808d.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#annulersessionAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#indexAction.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#phase4Action.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-Lot$tutNom.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#__construct.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getDateClo.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getDateOuv.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getId.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getParametre.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getSesActif.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#getSesLibelle.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#setDateClo.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#setDateOuv.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#setParametre.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#setSesActif.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Entity-SessionUt#setSesLibelle.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
	app/cache/prod/appProdUrlGenerator.php.meta
	app/cache/prod/appProdUrlMatcher.php
	app/cache/prod/appProdUrlMatcher.php.meta
	app/cache/prod/classes.map
	app/cache/prod/classes.php
	app/cache/prod/classes.php.meta
	app/cache/prod/sessions/sess_b3u79thobba6v48p7h4u1kn2q3
	app/cache/prod/sessions/sess_plq1qj3r235lrqcoofi81nbla5
	app/cache/prod/twig/0a/1c/d802f8bea75b62ef48cab6676e5a.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/0a/42/fe8d7aa76f5adb4efa6e474e0319.php
	app/cache/prod/twig/0c/4b/75376d207a01fe8bfa1c374551e7.php
	app/cache/prod/twig/0c/4b/75376d207a01fe8bfa1c374551e7.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/17/94/c62fb048e07dbb7c8c27d400ae65.php
	app/cache/prod/twig/17/94/c62fb048e07dbb7c8c27d400ae65.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/17/94/c62fb048e07dbb7c8c27d400ae65.php~cd03383123d96e913a477ceeb77654f5af76cefe
	app/cache/prod/twig/29/b0/4d160bfd2018f5373f216f1f6bb0.php
	app/cache/prod/twig/29/b0/4d160bfd2018f5373f216f1f6bb0.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/29/b0/4d160bfd2018f5373f216f1f6bb0.php~cd03383123d96e913a477ceeb77654f5af76cefe
	app/cache/prod/twig/39/f4/f0923927b25ea15d07550ee69d98.php
	app/cache/prod/twig/39/f4/f0923927b25ea15d07550ee69d98.php~1044f5c55a9e9ccbbb9e2b616ae8eebea2513595
	app/cache/prod/twig/3b/c4/57b551c4b3863a68fed3b2ca246f.php
	app/cache/prod/twig/6b/7f/fcb6c967eb441a8b49ea8e18707a.php
	app/cache/prod/twig/a1/bf/44d28fbe1c6b91c74fc5602c0cff.php
	app/cache/prod/twig/b5/f5/5566c80a9cf040bb7d07bc4cfc0b.php
	app/cache/prod/twig/c3/b4/18310a6cc7bdc0325d20832d7b5b.php
	app/cache/prod/twig/d0/26/3a4ac7dfdeb01859234ca61cd77b.php
	app/cache/prod/twig/db/44/a0cf40df5f692480c9680b1c20dc.php
	app/cache/prod/twig/df/ee/ba532f16934698a9396d576baf13.php
	app/config/routing.yml
	app/logs/dev.log
	app/logs/prod.log
	src/Sujet2/DevSpeBundle/Controller/DevSpeController.php
	src/Sujet2/DevSpeBundle/Form/EnseignantTypeAdresse.php
	src/Sujet2/DevSpeBundle/Resources/config/routing.yml
	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
Merge branch 'master' of https://github.com/Gerome54520/ProjetWebSujet2

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/twig/f3/3a/7ebd8526704972f8e08057619968.php
	app/config/parameters.yml
	app/logs/dev.log
	app/logs/prod.log
	src/Sujet2/DevSpeBundle/Controller/DevSpeController.php
	src/Sujet2/DevSpeBundle/Resources/config/routing.yml