nv modifications
Merge branch 'master' of https://github.com/alakhame/remi

Conflicts:
	Symfony/app/cache/dev/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$classe.cache.php
	Symfony/app/cache/dev/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$ecole.cache.php
	Symfony/app/cache/dev/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$ville.cache.php
	Symfony/app/cache/dev/annotations/160f3074abf48ebccc1bff73df7c51003df7fcb0#nameByIdAction.cache.php
	Symfony/app/cache/dev/annotations/160f3074abf48ebccc1bff73df7c51003df7fcb0#recusAction.cache.php
	Symfony/app/cache/dev/annotations/160f3074abf48ebccc1bff73df7c51003df7fcb0#sendAction.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#coursByIdAction.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#matCoursAction.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#matieresRevAction.cache.php
	Symfony/app/cache/dev/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec$idMat.cache.php
	Symfony/app/cache/dev/annotations/901e0f69f045105be1a000c7e91d09371a19d05a$ecole.cache.php
	Symfony/app/cache/dev/annotations/901e0f69f045105be1a000c7e91d09371a19d05a$niveau.cache.php
	Symfony/app/cache/dev/annotations/901e0f69f045105be1a000c7e91d09371a19d05a$numNat.cache.php
	Symfony/app/cache/dev/annotations/901e0f69f045105be1a000c7e91d09371a19d05a$ville.cache.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.xml
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/cache/dev/secure_random.seed
	Symfony/app/cache/dev/twig/0c/92/5b68a8aeac83371b04f80e4397e24b7e1e6f8765042ca9751dc66b29b845.php
	Symfony/app/cache/dev/twig/11/5d/35b2074185a04047cc01103f0a3d423701263a8fb683429eaebbcc3ed50f.php
	Symfony/app/cache/dev/twig/14/6d/c1e96fea0c9d20d99cc9912abbd6722a7149c3de168251140ca686ca949a.php
	Symfony/app/cache/dev/twig/21/07/3b2b23b9c36a091ef0917a71d960969fd47540001d98997160201e8681c8.php
	Symfony/app/cache/dev/twig/24/b5/579ca561317e8be3ccfc69ec983c62805947d8fd881ef9ed95b2b9b6cdb5.php
	Symfony/app/cache/dev/twig/38/4f/afd1f697b85573a0178a9f1328a10b5c47e8587903a83dae470694c70302.php
	Symfony/app/cache/dev/twig/40/33/55920d688001bdd8f2feea82b9a8f5770b53f10e406d006051b498927133.php
	Symfony/app/cache/dev/twig/40/9a/5ce8e6689c7a45a08b687242cbf29394f5306801caffa587bb8e946cf626.php
	Symfony/app/cache/dev/twig/45/37/627d2e5c4438373239d5a0d3b113d0e2634cf24289b15ecce1de1331c445.php
	Symfony/app/cache/dev/twig/49/45/c8de443804dc95c7d4c3902e47f3c62e09c76059bb1ba654762fad12388c.php
	Symfony/app/cache/dev/twig/53/9a/71d8919e1cc9d1bfbc425c667b357daa7cd0b6c76bb3b51b69d5af3547e6.php
	Symfony/app/cache/dev/twig/56/be/bcae9018292bb80ca2fe087db147b514485e1373f89518e00d2b2b2e0573.php
	Symfony/app/cache/dev/twig/57/27/ec9ec40454026f068bc42b404df8b7dc009941b6022aaebe12867af968c9.php
	Symfony/app/cache/dev/twig/58/b8/476b30fa753c27f9242f20b92db67f7eb8939598da0b157f83dac61b322f.php
	Symfony/app/cache/dev/twig/5c/2c/dd07aafdfb94fc36d18db095fd8e94a75751fbe46a0f04c95060ef32e460.php
	Symfony/app/cache/dev/twig/65/8a/017ea449ad4b3fbdb8d6ee0ee9a38626d2a6790d7afce03554b7f69fdeb3.php
	Symfony/app/cache/dev/twig/69/7f/2e75df84dd961f2dd621543e7fd5d8e4e3ea0c5a3849a688dbd75fdcb12a.php
	Symfony/app/cache/dev/twig/6c/b8/7b0a42862ce68f264a265d5ab72d556fa3eefd25ca9f244570b650a75dce.php
	Symfony/app/cache/dev/twig/71/e4/4cffd333cff0628ab95bb74a57dd32b8e7227c0c8b0449f75f96441095d1.php
	Symfony/app/cache/dev/twig/7c/fe/b7ece471f0ba21633b8eed7bf708161150653adb82760096c39f74d7f09d.php
	Symfony/app/cache/dev/twig/81/23/bdfffd6aeeab86e24acba8308abb3db487034845ef878816ff9f43bcc183.php
	Symfony/app/cache/dev/twig/85/39/1592957fcbe745356b60f788e4ee29a990be7b27247494fc5aeae1afba95.php
	Symfony/app/cache/dev/twig/8e/48/419b281bb01a80c8797a7c616d34459aa4747ce0a6dc1502f2741498afde.php
	Symfony/app/cache/dev/twig/8f/54/ae10298bc39c5ffae696ca2d214c9265a533ebde6899d0304825dfe40d36.php
	Symfony/app/cache/dev/twig/8f/f2/bc2e35f47b76b26b3341941782f6cfe7a57735765950135c11364bace211.php
	Symfony/app/cache/dev/twig/91/61/aebc17c0ab89d8ddb1e4d10af14d4bb3b3be1409a3f09bbf63d67e744fe6.php
	Symfony/app/cache/dev/twig/95/aa/7ff32d15c1b670698694a9f1809a15b46102acf8fa6b0309a204e0a9509d.php
	Symfony/app/cache/dev/twig/a5/ac/097fb690d9dc6a12e4139d3bd357abfd2cf3f6f59a85bff19a99d92fa3a4.php
	Symfony/app/cache/dev/twig/aa/79/66a4841f7823bb6d48a0d133080574fe910e2c538f85d708f3e731226d08.php
	Symfony/app/cache/dev/twig/b3/13/05ffc390054c318e351336931ec7af1e24ae4581c1a98c58792455e4fd9c.php
	Symfony/app/cache/dev/twig/b6/d7/285e9184ca55a50eb3d712c0667868d6d226273cc72b2df6733a8a280ccb.php
	Symfony/app/cache/dev/twig/b9/68/fba3243fc0273ee395ad89fbad7011258a7336b49da7ddabde2baf3f5bc8.php
	Symfony/app/cache/dev/twig/c1/63/90644e6b8b258cd4120f78fc0ce8c456e61ef07a9596ba9ed875672cb118.php
	Symfony/app/cache/dev/twig/c2/3a/f3c6f64996f44f4df9d73a29ed4f3cf5885e853e0585f9fdb0c2e1d2bfff.php
	Symfony/app/cache/dev/twig/ca/06/3d2373b3b854b6cae63babf5d5cf195c8b784b9723ebf2fbdb66152bd5cc.php
	Symfony/app/cache/dev/twig/d4/64/36d62472930e42d15db5d5a3df1a4e97ffefc4086b2fd2ed36641ba5404d.php
	Symfony/app/cache/dev/twig/e3/c5/36509693ee80350e6441bf84310f5d459325554fd9492da1f0274341fcaf.php
	Symfony/app/cache/dev/twig/f3/bd/bf86aaf5ba3d82cf9b42357402fb4b30e67438cf9c337f4988fc48e14c12.php
	Symfony/app/cache/prod/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$classe.cache.php
	Symfony/app/cache/prod/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$ecole.cache.php
	Symfony/app/cache/prod/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$id.cache.php
	Symfony/app/cache/prod/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551$ville.cache.php
	Symfony/app/cache/prod/annotations/01e0f9686ad35f2570bef9662cdca1e14bb4e551.cache.php
	Symfony/app/cache/prod/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec$id.cache.php
	Symfony/app/cache/prod/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec$idMat.cache.php
	Symfony/app/cache/prod/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec$idUser.cache.php
	Symfony/app/cache/prod/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec$note.cache.php
	Symfony/app/cache/prod/annotations/64b026ab8c07fc4bf35107532191bd65da2862ec.cache.php
	Symfony/app/cache/prod/annotations/83dd60ff13ddb6ba5c97d77c116130fbc040daf3$id.cache.php
	Symfony/app/cache/prod/annotations/83dd60ff13ddb6ba5c97d77c116130fbc040daf3$idMatiere.cache.php
	Symfony/app/cache/prod/annotations/83dd60ff13ddb6ba5c97d77c116130fbc040daf3$titre.cache.php
	Symfony/app/cache/prod/annotations/83dd60ff13ddb6ba5c97d77c116130fbc040daf3.cache.php
	Symfony/app/cache/prod/annotations/901e0f69f045105be1a000c7e91d09371a19d05a$id.cache.php
	Symfony/app/cache/prod/annotations/901e0f69f045105be1a000c7e91d09371a19d05a.cache.php
	Symfony/app/cache/prod/annotations/b52ea85948a1c5b9bb1efeee788d43a2ecdba75f$expiresAt.cache.php
	Symfony/app/cache/prod/annotations/b52ea85948a1c5b9bb1efeee788d43a2ecdba75f$lastLogin.cache.php
	Symfony/app/cache/prod/annotations/b52ea85948a1c5b9bb1efeee788d43a2ecdba75f$locked.cache.php
	Symfony/app/cache/prod/annotations/b687ff2f89d3d52aed30efef72d278e4efe48fc7.cache.php
	Symfony/app/cache/prod/annotations/bacf0cdeb6c842d535c7d3be7d1f887ab921151a$etat.cache.php
	Symfony/app/cache/prod/annotations/bacf0cdeb6c842d535c7d3be7d1f887ab921151a$id.cache.php
	Symfony/app/cache/prod/annotations/bacf0cdeb6c842d535c7d3be7d1f887ab921151a$idCours.cache.php
	Symfony/app/cache/prod/annotations/bacf0cdeb6c842d535c7d3be7d1f887ab921151a$idUser.cache.php
	Symfony/app/cache/prod/annotations/bacf0cdeb6c842d535c7d3be7d1f887ab921151a.cache.php
	Symfony/app/cache/prod/annotations/bd639b40fa8b290a8a2c57185a6e734bc96e3129$etat.cache.php
	Symfony/app/cache/prod/annotations/bd639b40fa8b290a8a2c57185a6e734bc96e3129$idEleve.cache.php
	Symfony/app/cache/prod/annotations/bd639b40fa8b290a8a2c57185a6e734bc96e3129$idProf.cache.php
	Symfony/app/cache/prod/annotations/c5ae790abb58cbe987ef349fa1ad5ca42f2929bb$id.cache.php
	Symfony/app/cache/prod/annotations/c5ae790abb58cbe987ef349fa1ad5ca42f2929bb.cache.php
	Symfony/app/cache/prod/annotations/e80c1a2a18e7e5d994915066d6c2092fb158e505$idNiveau.cache.php
	Symfony/app/cache/prod/annotations/e80c1a2a18e7e5d994915066d6c2092fb158e505$idUser.cache.php
	Symfony/app/cache/prod/annotations/e80c1a2a18e7e5d994915066d6c2092fb158e505.cache.php
	Symfony/app/logs/dev.log
	Symfony/src/Innovit/GeneralBundle/Controller/GeneralController.php
	Symfony/src/Innovit/GeneralBundle/Resources/views/General/Layoutgeneral.php.twig
	Symfony/src/Innovit/GeneralBundle/Resources/views/General/general.html.twig
	Symfony/src/Innovit/ProfilBundle/Resources/views/profil/test.html.twig
modification nv
nv modifications