Préparation avant merge.

Modif : Test d'instanciation de constante.
Need to get data from server.
++ vider le cacheeeee
Mise à jour du projet

Détails :
- module de connexion (local)
- ajout de routes
- modifications de pages twig
Commit de test

ajout de d'un fichier lol.txt
Merge branch 'symfony' of https://github.com/ISEN-CIR3/diapazen into symfony

Conflicts:
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#__clone.cache.php
	app/cache/dev/annotations/137636d9a151ece443ec1a0bc45bacf9998ded1a#__construct.cache.php
	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.meta
	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/templates.php
	app/cache/dev/twig/00/84/30b1374814929f90a9aeef56d84c210368e40d6928542e2504a003d3857d.php
	app/cache/dev/twig/04/28/a46df3d80de41b3d410339bee368bd447c6ce29a88962b74761e33cf7b74.php
	app/cache/dev/twig/05/6d/c6bb1a65d414827fc8144bb0847a3bae1f413b1ee25b05bf21e6f24499d7.php
	app/cache/dev/twig/05/a0/4b9c5e62c67b8a7bf7ba45a32f3e5f863825459013ca07aec7b4306d6305.php
	app/cache/dev/twig/07/5b/242b26465db9e42601a87bebd4d8b39f4b85c9f4b11a55ecbcb0c3195ea5.php
	app/cache/dev/twig/09/cf/32db9fcf081a209426308912bf305636085f566ce35333ed704a0bd00624.php
	app/cache/dev/twig/0a/9e/7abb4c97daf5eea668f0b79d2b6ada44108c380ff69cefbb90b2f65ff1e6.php
	app/cache/dev/twig/0c/0e/08fcd0e6953670b38822253cd3fa9d566b822fb59fc6ee7db77cc524fc89.php
	app/cache/dev/twig/12/91/6f52076d760a22c0d12618f3a0c370ba120727295c6c631bde20ab6dd99e.php
	app/cache/dev/twig/15/9b/ad6a91c4df7474cfc54c333d80a62c1d7c75bb7631541912c95356d175db.php
	app/cache/dev/twig/18/31/073db38d3eb19d0c41210ff7bff8519f13c7721a462c9f7d618bf6ecba51.php
	app/cache/dev/twig/1b/8e/d8010dbf0c260d04cad3790c8e3ab56570bde359a37bebeab6fd47bf2d5a.php
	app/cache/dev/twig/1d/86/a2de9a9198307bf322b9ab235ea5fd4fbce013d3dc97084ba5b8345e85d3.php
	app/cache/dev/twig/1e/f1/dbac2ef5b6a0b1dbd844e8aeca5c1fe15affbfd0c67ac744a1225085be92.php
	app/cache/dev/twig/1f/08/504f66853ac4e721c339f49eb31c69a2c776c69c0a753bf11e7eed6ce818.php
	app/cache/dev/twig/1f/ba/40bd5c03ab88a52dfbf33ceab333c4602c162de0439b11fb60c573664e9a.php
	app/cache/dev/twig/21/0c/eb70af4a4ee9271dda125aa94bcf08f892019a05ace64cb9dbeb6d95473a.php
	app/cache/dev/twig/21/0d/7b89c8a2e973bd95512a5ec9a44a594ca86e73f07cae51c3b0cf55560a13.php
	app/cache/dev/twig/21/fd/7d4eb466442edc799b6f41a01ec897477520958988c1c023deb061cc1e97.php
	app/cache/dev/twig/25/ae/3bb6593a31435b62ed984f39c50fd8646ed48cce56b50f66c1f592d2f924.php
	app/cache/dev/twig/26/d6/823b5f661eb2b618f628619b36fdb114fa732433ec096e9668f5b30a1d8d.php
	app/cache/dev/twig/28/db/6b663b4e3be290e07ba57263bb7304b6e043ec9634fdc7868319d386f96b.php
	app/cache/dev/twig/2a/ab/cbdb8571ec2a018ecc8269910e3c0b2b8a77c9852faf3d7e62a37b143191.php
	app/cache/dev/twig/2d/21/85bae9075f3dee88d350cc1096ef6cc9701b70f2f0d6188354751508bd28.php
	app/cache/dev/twig/2d/c3/aa6f565633f26774e0953e44142923f2e3d7986f49406da99e95fe0048a2.php
	app/cache/dev/twig/2e/5d/71b97f98e2bb5d87ff37b67b14256d459328e3e3fd3c3a5e62578ed5134b.php
	app/cache/dev/twig/2f/99/861fad3a4e5094d692dd3bb5047670d780a73265a2e0d8ef3f6a580284a7.php
	app/cache/dev/twig/2f/9a/d092e1e872ca3ac4d86b24a43e9a2d5086be127a5afd974d3ed6a04f6b62.php
	app/cache/dev/twig/30/a2/9e7d3f4f42430031a8afe7d781fe6fba1d0d0f15325ed467f62fd0345e94.php
	app/cache/dev/twig/33/23/137eae8a7439cc4ec73632471d4b50381ee48b34ba8bba99f8411bddb8a7.php
	app/cache/dev/twig/34/b2/e6c4e4e504a3309cb6aee232429f3954d4b06d016c87fb6b5d13f8aaa54b.php
	app/cache/dev/twig/34/c2/cb3a02f7d4ddeae46914191db5670b3abd81e2f4f65d1284ec235067d7af.php
	app/cache/dev/twig/35/07/501dfb0683e5262acf286ecf262e6b5894724e888400f3629ad6d38e6dae.php
	app/cache/dev/twig/35/b7/85f6dfc78c5a8b4c89b5e722581f3b9fee979122b86a165134398d4f3535.php
	app/cache/dev/twig/36/d9/09d7dece84ce1d964e29acab001886073321df4f0e68883984f61175de01.php
	app/cache/dev/twig/36/fd/a07dc2738f792f27a704800323d8a117c9cd4b24323e428d24a2a8057ef6.php
	app/cache/dev/twig/39/d3/c76e23f81cbc760c63f2280fde78c58ad4e1adec5cbce7aee04f6598a613.php
	app/cache/dev/twig/3a/0f/f54ad858bc1210fdc666c6e23f23d52f047ae8d31501e5599fbf799a52fe.php
	app/cache/dev/twig/3b/8b/79383f6907d904ec6a7086108f90d439742a592487c6bd4b21bfc7a5d46f.php
	app/cache/dev/twig/3c/c1/5ad6c3c8155110e325124483b0fd9c709c3053dcd98231210a2fb55e073c.php
	app/cache/dev/twig/3d/03/a28150b9ed6fe3edb44d4edc4d4b6aca9a3edd3592e02b091972319cacbe.php
	app/cache/dev/twig/3d/de/24968611989bb32bc37fffdc0a7987d65f36450a5288774135f6cc1223be.php
	app/cache/dev/twig/3e/6f/fcf55901de97e013b5f862ae174d57ca128db7d4ba1e7f6cc1e8cdf9b2ae.php
	app/cache/dev/twig/40/0e/298153351327ed0aafe90f6d15853d216628b9dddd0d73f5f39e55eb16e0.php
	app/cache/dev/twig/41/dd/c86858ad2a1661eb35e63fe654442e9b9241d3f994c61f00d9ac716b7edd.php
	app/cache/dev/twig/42/dd/f4ee3ed092e0266829d20a9bf06de203f5defff8f3058e9efd5801ffa79b.php
	app/cache/dev/twig/43/57/535a5cded2191ab78a9cc47b12c230e6372c12bcd4f98bb7b8af181d5dcc.php
	app/cache/dev/twig/44/4a/1671c243583143f2ea690f9598a231e7219d6817c4ef4c3a5289b4744185.php
	app/cache/dev/twig/47/4d/3389fa57af67ad7ebc6ede31b06f4233ee183ce68d9c4adcfd21552859dd.php
	app/cache/dev/twig/49/31/87d5447371216eb215ca438d3f79ee90327172d381d0f73262f21fcd4091.php
	app/cache/dev/twig/49/f3/a9d32d98e8528ed5db3a693406b3d5a0e419ebb0982845e4f779e71e5dea.php
	app/cache/dev/twig/4c/e8/8106fde92287dfb2290719abecfdf78178740ff84b6d20841ccaec9898b5.php
	app/cache/dev/twig/4d/c4/281b89cdd83bd12e59a2b8802abd6cc9f7fcb81d68e4e3c301a1091cfdcd.php
	app/cache/dev/twig/4e/1e/c316ad9df177d37d4f830e1f4602ac2326ae0c851a2cd81374240b83e5c0.php
	app/cache/dev/twig/50/20/9c4cbd89d69f17422f43987cbe80cda1f4858399c7d5309d80b2e4adecee.php
	app/cache/dev/twig/51/a4/f8d81bb1136c72d7b718b382fce34c10baf93a17e664449dc974b6719526.php
	app/cache/dev/twig/54/a0/360ab55ff6414be8c792d6e6091ec06a48b2e1b3065e70b64ef7ead5f5cb.php
	app/cache/dev/twig/55/5e/bbfc9811c57af5c4b378d11ba3ebcde3c1700a51b1c145658ed59ea9f78b.php
	app/cache/dev/twig/57/05/1bf40d16bf5672c665be3fef002251aacdcd66d8aed8c8c0a5a26c6efdb0.php
	app/cache/dev/twig/57/ef/7ba89ffc6fed941abf430cac5bbc02d698eba68e637f820e1a2e4f63fd8e.php
	app/cache/dev/twig/58/1e/f7e43512a4cf8494f12b422b1eae2e5efdff544e537d7044e53e1d490149.php
	app/cache/dev/twig/5a/4d/5f271d0969d28a5dbaf23a49a47a3f15ab32e55e899219691fb7949db0d2.php
	app/cache/dev/twig/5d/d0/7a47967234437906957e2a20da137761d07cdee8d898030757f6e756b0c2.php
	app/cache/dev/twig/63/8a/9d8e60677e7f6ffe58db42b899d28b83c08a387dfee6fa671bfa82c2634c.php
	app/cache/dev/twig/64/49/ae2638c40997fcf5df4cafb77e97b6739a6386441db9d684bac9c8524a4b.php
	app/cache/dev/twig/6a/51/3056892eb9bda430f02ae789eecf20311766b2b5504248789f474ad6e340.php
	app/cache/dev/twig/6b/3e/898dab7ea47ccbc12c9717fbe53e011efd1742b356aeb2d1d722dc22dc81.php
	app/cache/dev/twig/6c/f8/8836288a8799e6619a7958acb80634604e76680d320dffe7bc8d9f38b193.php
	app/cache/dev/twig/70/a5/f15da7cd4ca396095b1e242177cb6e84796bf18dc29e875e0599c6f443d6.php
	app/cache/dev/twig/71/1e/61bfbd976d4dbf350695ed92828ec2c62668b42ee95a523d28adb9e9b75d.php
	app/cache/dev/twig/71/df/481c24a11c9d3dcde90c9266590f06699f89470f0a90f20ee9cc689644b0.php
	app/cache/dev/twig/73/77/1173fab7858a430e34bff633fb3c1d413c323cb3fafdb3a302c312325b0f.php
	app/cache/dev/twig/74/6c/012270cbfd39eddbb98bdc161908396068745acd4bcf5e9b2228958568f4.php
	app/cache/dev/twig/75/9b/315372c913eef058abf80125dffa79d893d8034d6539b7c0fdb19aa3570e.php
	app/cache/dev/twig/76/66/b74864a95daa8bbd771ad28417b31911f591749af4c638a05ebef51117f8.php
	app/cache/dev/twig/79/09/1ce6d33b3723635b9d79afe816e7e15a3d53d492cdeba8e9bec121bf35da.php
	app/cache/dev/twig/7b/fa/3e89547258aa48d3b402bba01a70985d231e6713e69f151973c94d7d4591.php
	app/cache/dev/twig/7d/5c/8908e3501ec4bf7b57972db64a740119d5662c6779a75c56e088678a3d41.php
	app/cache/dev/twig/7e/60/e27650a3041522627fbf5297e2c87e48fe60f8e504e8ed653826b2a6c9e9.php
	app/cache/dev/twig/7e/bb/cf5c6920ac936248c907fd0b3cf7ff8ca8899a643791561eae73e7a16ca5.php
	app/cache/dev/twig/7f/dc/39a147de526d66851ba51d8509c90c8692e94ab074e7f35336c37a42111a.php
	app/cache/dev/twig/80/45/4b2a227a787ecb6af21b0bd12555ebfedb223eb78af5ea91ffbea7f984f7.php
	app/cache/dev/twig/81/7a/a45859c266097a2ccc4b952db1750770ea2cff862c40f97162ff95bdd321.php
	app/cache/dev/twig/82/79/181b159832ff99b3ed2065602a262c20eb4b213e8e7350b3ac061e214e4e.php
	app/cache/dev/twig/84/1b/87a200ab7e2268191c7116a175f5627201a4e465d750780374b68d37b1c4.php
	app/cache/dev/twig/85/1c/d3f007c4049963fcd4446c9fb0b56d7454453898c1b420a5d1d30fe28608.php
	app/cache/dev/twig/85/21/5d0f16ad7c7b32ca86f864b2cbd9f99f5301b1316cdd31551ebc276cea23.php
	app/cache/dev/twig/85/34/ba1878711a3657a8b77227930349d0a5db4884acdc38afa689aee166311f.php
	app/cache/dev/twig/85/c8/95ae41fe67d4c8b11077288274be21cf763e71ce7ff4ce4cd3a56bea620e.php
	app/cache/dev/twig/85/dd/b068bea8f1d31bd932c5d6df788cefccb3879fef8e2e35f13a35089ad8c9.php
	app/cache/dev/twig/86/32/587544c785f217f76cd9cde226d8bb4a1c0a38ad9719724ff5ef0413d4ac.php
	app/cache/dev/twig/86/ce/d8863a285fa8d69c852432d0876dfdf1e344947a5b77776c4c1123087107.php
	app/cache/dev/twig/87/6c/4e5c56371ce0e99f3708c7e7247f3f92d164d5e012d39ad69b4a4b9b42e2.php
	app/cache/dev/twig/8c/cd/0563b7d123783d9d1c834efc90892ba1ff906ececa2529bd7ca066f4d088.php
	app/cache/dev/twig/8d/b6/4e7eee4be07cb5e76be768ea852d830f0a5f8515f61734c83144116e97ad.php
	app/cache/dev/twig/8f/28/4dc20d79011c6af9a930826d1530793ea2f514acf9ffff8e01a3cb063a74.php
	app/cache/dev/twig/8f/da/04671b8ef27f4dcbd9d5438e6a29eeb3a58f33b4877ac8cf97d5175473c6.php
	app/cache/dev/twig/90/52/727938a8eabf9d77ac541c71be824789df60d893761babb13bfff7033683.php
	app/cache/dev/twig/92/cd/35e05f6c3e17494ab8b1570580c4036c96664c9117e597c40f83bf6d56ea.php
	app/cache/dev/twig/93/47/8a6d875f2c713a41829588901dc0a7fbe1d4acfe2c97befe3218b666bf89.php
	app/cache/dev/twig/93/ad/34d8cfdfd6b5e65d713b42fa29f8dd45939918514909bde9524911ff306f.php
	app/cache/dev/twig/94/2b/963e67b385dc242f453acda808b2a26f8f753faef235311b9e2f5b60cc7d.php
	app/cache/dev/twig/96/75/6d2a1f963d6ba18cbb68d609ebb042e853ad76f9b819c1bb2d57d3eda799.php
	app/cache/dev/twig/96/7c/fb69cadd62a5c019a42e077b6870bb7c004c1ac612df176f3e630df52987.php
	app/cache/dev/twig/97/20/83e1260e7da73627024df24f02a1e156b11f04ac8cb58e944df3fd2336dd.php
	app/cache/dev/twig/98/08/72cee342a4667da687b51980346e4978aa0181e5baccc97718b275731ea2.php
	app/cache/dev/twig/99/84/ca8bc621469aeca67a2bc2472dfbba385d7b45316deb2026631d34c4feb4.php
	app/cache/dev/twig/9c/18/aa74ab40ce0ee6d4ec06c395a064f321af6075d1c4ab74284d651887cafa.php
	app/cache/dev/twig/9e/68/741e4eaa37b4bab416d3dbe0cb599bf8c71edb358f2e4333b95e47a5c635.php
	app/cache/dev/twig/9f/49/ff57a7544737082868d3fa28a739f74518bf1a5566b824363e2e15b7aeda.php
	app/cache/dev/twig/9f/79/b42009765325fb0a82b325399dda1c64f4332b570c146ab5b8f6ff289b39.php
	app/cache/dev/twig/a6/50/69eb795717254add1066e727f3f4f91e83d578644376eb384392c74b3173.php
	app/cache/dev/twig/a8/c2/4ef89f9e2af037e1a8b9c981331deea1e03e694d0075fb1fa8f76d4d9107.php
	app/cache/dev/twig/ac/3c/5ceb1513b02f0e584b2fba3f7eb7e1836e913090f4392712616178b0e89d.php
	app/cache/dev/twig/ad/8f/2c95c1e59b2f97890e2d5a5fa49cdd74faf96802bd9b0a608723387503aa.php
	app/cache/dev/twig/ae/83/c45e0269ba032694d586c855ee10d2e2e6be017afe7931edf1d1fac6c559.php
	app/cache/dev/twig/b1/dc/31369940a51d22b12c66f9e31467d42fddef647a251b6207ad31a0ee7c7d.php
	app/cache/dev/twig/b4/28/367f2589178e138107e8f0772c7147fe80a5527bfe0ff5228da69e6331e5.php
	app/cache/dev/twig/b5/ec/2440d3124b731c836feff0796d173ed2c654a866055f7fa71e1f128a4a69.php
	app/cache/dev/twig/b9/91/daaaba959c5a7bccf7a47de89d6231f9c04523b4ba6738a5a216d2a41499.php
	app/cache/dev/twig/ba/0a/4bb63bd0159b889b82571524b960b2896a4e23538e0df20adbb4b5ae5933.php
	app/cache/dev/twig/bb/12/3f3be593aec958b8921bc140aaa5096e4e506f7184ca77c18510440b7a05.php
	app/cache/dev/twig/bf/f3/91d4143a1e1087f160bdac6ab9c515c1ec096e7d18df87edd20cbca004a6.php
	app/cache/dev/twig/c1/2c/ccf87642e2c111a28bc279d36b7fc5ebf181b3ce9e715e9d50647ed61016.php
	app/cache/dev/twig/c2/30/9bc5868f17ffda176f0e2d0adbb57ba4ce3c1b0aed8383b7127b5d527afd.php
	app/cache/dev/twig/c2/59/089ffc144423f5738d66198d79b600397562dec19a069e376fce50bee2a3.php
	app/cache/dev/twig/c4/20/6325451c2844c28abbc526a3511f6b24306a43cc6d6afc231896e608fbd3.php
	app/cache/dev/twig/c6/e0/3f7c7632de3f44ad374ac6a52541753e58110ddb65f91de61de3368aa7c7.php
	app/cache/dev/twig/c7/34/0ed937d8551957692fbadb600784ceaf20c63242194ebde71107bf07aca2.php
	app/cache/dev/twig/c7/ee/f82738f4d7a16e6ac134cf850f0611754feac802c69dff5158d4e15851ae.php
	app/cache/dev/twig/c9/65/b2d882c0be33ff7aac49b762d5cfa25f2b921b6cf206bc685ff4f6de46cf.php
	app/cache/dev/twig/cb/26/9cf2136e96cf7ed2d061b36981274bec6d3889b52140168d9ff7cb402312.php
	app/cache/dev/twig/cb/ac/91b86a0cf487ec49a55083e2c1dd3b0a33ee65eca9ca953402cdee765f13.php
	app/cache/dev/twig/cc/10/55825e359407188ac09bb00772ae956e7bf41434aa253f71cfb3855b2fd6.php
	app/cache/dev/twig/cf/ca/4672919313cbeb3fc2c9aba88c8faca002d63a80ff5780e1da553a953686.php
	app/cache/dev/twig/d1/b5/ea5fa26c1a895723a194220afccc639dd26d1ae61960ed6474a3973030d0.php
	app/cache/dev/twig/d2/5b/cd557564d5efcda1fdbf98fee38c1dfb59ab1d60dd5dbd0dbf2914e3f606.php
	app/cache/dev/twig/d4/15/224960cf52b7fba423fd7a43fde26cc6934dd959a428b16ab70da85f7515.php
	app/cache/dev/twig/d5/86/26b1363454c880a6d549861539501a8bac62c0313a4d2d78c49fe83ea94a.php
	app/cache/dev/twig/d6/02/330348e25eda97433df8446d5e03a1b4a007867d4f410378efa12c327062.php
	app/cache/dev/twig/d6/07/c1be62280eb0495ddaf60cce711c598a56836ad6ef6c776aa9d19c20d250.php
	app/cache/dev/twig/dc/8f/a6ebc5fd82c1663651c6efd2464150f851a0b4306ec8771c2dcecbb63121.php
	app/cache/dev/twig/dd/d1/407859c1edea342a1c909baac73d4ba478f1af2df91298f5ed742c9d130d.php
	app/cache/dev/twig/de/ab/52589093934aea42a21e4a05a021f936287ea4df5b8f24b87ae0fbbd2194.php
	app/cache/dev/twig/e2/0d/ebf4e245179db73d618474bf3a03204bbf41af705d98e439d2801400ae6a.php
	app/cache/dev/twig/e2/17/545ff18f7b01556c2ff05d70de398ca8e8dad4069fb709f6d0f0f8600470.php
	app/cache/dev/twig/e2/53/4d234f55020f5e59aa981bda4c098a5137d6cb383ebcc82cd5243ee5f8e3.php
	app/cache/dev/twig/e2/64/058e4f9506efbb261d0f70e46dda1d93cc8639b7aeb64587a69a06bb6acb.php
	app/cache/dev/twig/e4/ff/ab3467229cfffb4978e3c8b0ef92928bf494716641cd3e92fcc5e0497532.php
	app/cache/dev/twig/e5/67/242da2cda8bdfad36bd80d97ae2afb7f246f9ab5354377ff7e4da1d9cb2b.php
	app/cache/dev/twig/e6/82/f8eac227311d88507174a8bd64bd7c765ea3d1c0323e4a7c228a2d0fd103.php
	app/cache/dev/twig/e6/90/1636a5b1cacc3ee372d4bb1bae2db516e4f741ccc19d9b2e3013faac12fe.php
	app/cache/dev/twig/e7/e4/bdd6ed2805c067002d2be3c376036e12dd33cd7d42d1a12916f6a2428370.php
	app/cache/dev/twig/e8/14/3757b8bc6826982d9281b1cecf0d8eb9d27da8672ad2c8975aef89b93a13.php
	app/cache/dev/twig/e8/e5/7bc45c299e208095583fc7bac9073052002946b5d7874c4d75c31283d3cc.php
	app/cache/dev/twig/e8/fb/f070911f07664d906e313adf6b955540c3e51d12d5f71d7bcd729e5d24ba.php
	app/cache/dev/twig/ea/67/3967bbd7fd69b5e9e0737e7c9d58b99eea0a6f196fa931cfe2af6cec35f7.php
	app/cache/dev/twig/ea/6d/447e6586a73fdaa27ed7039c5602a576f3669c1c7f41499f97ad24f1bb81.php
	app/cache/dev/twig/ec/05/f37f2d364c8ef76018e69ba1fde99e88590c3c1fc74a9a137c081f2ba86d.php
	app/cache/dev/twig/f2/8f/c0119625bcb1bb1ec6fe17dbbf6ca1fd3d779766d3db57fa6842f77cb5fb.php
	app/cache/dev/twig/f3/52/763023a605057c17ee15e4c1c2c729a9d0e284de02295da76e9ab98c8c7f.php
	app/cache/dev/twig/f3/8d/578c78e3547a56495534fe9e6a3141a9eb5955963c1c1665bc9b8fb9048d.php
	app/cache/dev/twig/f4/82/5b1af977601c131bf68a331d3b73eb41771bcc6d6b98b238fe028e2af64d.php
	app/cache/dev/twig/f7/1e/8c2eebd4bc4870804a8085da60971000ff4170f06da2e8fbadb0e2fa3998.php
	app/cache/dev/twig/fd/1b/46c6642eb24b1a3fcf8e1bc7ecafb512560930f11d1d4c9a2d08b3239b6b.php
	app/cache/dev/twig/fe/1b/36c6a1f35dbab54e851ce82409848e59b482639a2eb40df1db27d5b474a2.php
	app/logs/dev.log
	src/Bdls/ProjetBundle/Controller/IndexController.php
	src/Bdls/ProjetBundle/Controller/PollController.php
	src/Bdls/ProjetBundle/Resources/views/Default/home.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/layout.html.twig
Modification mineur de controler/vue

Modification du controler de la vue du sondage.
Modification de la vue twig associée.
Zoubi
Merge remote-tracking branch 'origin/symfony' into symfony

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/twig/07/5b/242b26465db9e42601a87bebd4d8b39f4b85c9f4b11a55ecbcb0c3195ea5.php
	app/cache/dev/twig/07/78/919ad5ce4c1eb4f04ee2c2277429aee0a7833cf4aba045cd5af40148ee96.php
	app/cache/dev/twig/0e/73/f4c765bec0f77660f32d06a604de619a685b115bb91de4bfcee612b178f3.php
	app/cache/dev/twig/14/b8/75fa98d76e8b9e537a46fcdbf50418a62d0ada2e986f8814c256541dbf45.php
	app/cache/dev/twig/18/a2/0214624ddd634f97d2bf49a669bc3e135bde8dd6ee8aa101752811ed5813.php
	app/cache/dev/twig/2c/b1/1af05d666e07e4b4327275530fd8227d2bd1e83a9c59ddf98c70e533c458.php
	app/cache/dev/twig/34/c2/cb3a02f7d4ddeae46914191db5670b3abd81e2f4f65d1284ec235067d7af.php
	app/cache/dev/twig/36/d9/09d7dece84ce1d964e29acab001886073321df4f0e68883984f61175de01.php
	app/cache/dev/twig/3a/0f/f54ad858bc1210fdc666c6e23f23d52f047ae8d31501e5599fbf799a52fe.php
	app/cache/dev/twig/3b/8b/79383f6907d904ec6a7086108f90d439742a592487c6bd4b21bfc7a5d46f.php
	app/cache/dev/twig/3d/03/a28150b9ed6fe3edb44d4edc4d4b6aca9a3edd3592e02b091972319cacbe.php
	app/cache/dev/twig/3e/c1/f7bd4785b30881d225133ac343286865f603c8ae19b3f1fbdff0278123a8.php
	app/cache/dev/twig/3f/09/9c74168da55f7eae7c359f60044bf8466a7f75819da670967cc6df24ce55.php
	app/cache/dev/twig/40/79/8f70893d378d50ce0a53f57b592698512ad4d778c89f04692bd24158e329.php
	app/cache/dev/twig/42/dd/f4ee3ed092e0266829d20a9bf06de203f5defff8f3058e9efd5801ffa79b.php
	app/cache/dev/twig/47/fa/363f0f51a70b1cb53ad6306fe5880a886f6d43177abe6d1c9b0f5de9baaa.php
	app/cache/dev/twig/4e/1e/c316ad9df177d37d4f830e1f4602ac2326ae0c851a2cd81374240b83e5c0.php
	app/cache/dev/twig/52/2c/c4661f597e3277c0aa8bff4e3daee5c186def678e972fc806fc294eb2e29.php
	app/cache/dev/twig/58/1e/f7e43512a4cf8494f12b422b1eae2e5efdff544e537d7044e53e1d490149.php
	app/cache/dev/twig/58/79/65dec93435085f6d71b95a0a4a7b1f6eb32a012c09f499cb06fa4808bbb7.php
	app/cache/dev/twig/5a/9f/19b8d324181bde1b0bfa015336d09a24d6ac178053ec513453746fcbdd2c.php
	app/cache/dev/twig/64/c4/f323fb051a339411775915f2ff04541a1ffd43990ed43fb3a8da80e485f6.php
	app/cache/dev/twig/6b/3e/898dab7ea47ccbc12c9717fbe53e011efd1742b356aeb2d1d722dc22dc81.php
	app/cache/dev/twig/6b/74/49c4e11b0fe9f075a1c6bef0fa99f324eca285497a8b0708c28805c37585.php
	app/cache/dev/twig/76/40/07dc863490be2ca2575c00ee71d0074423a051a877ff8dbfe691d3d728b4.php
	app/cache/dev/twig/76/f8/8c356111606b208492dc21e575c4230c22c16b6b524dbf91fb900c9544ce.php
	app/cache/dev/twig/7b/fa/3e89547258aa48d3b402bba01a70985d231e6713e69f151973c94d7d4591.php
	app/cache/dev/twig/7e/60/e27650a3041522627fbf5297e2c87e48fe60f8e504e8ed653826b2a6c9e9.php
	app/cache/dev/twig/85/34/ba1878711a3657a8b77227930349d0a5db4884acdc38afa689aee166311f.php
	app/cache/dev/twig/87/6c/4e5c56371ce0e99f3708c7e7247f3f92d164d5e012d39ad69b4a4b9b42e2.php
	app/cache/dev/twig/8d/b6/4e7eee4be07cb5e76be768ea852d830f0a5f8515f61734c83144116e97ad.php
	app/cache/dev/twig/97/20/62f0285480945927ea58902fca3112c61459b810178bb3b199268eb4e636.php
	app/cache/dev/twig/9a/b4/5cd798a399a6d4cdc5cc09d53df5532ae45c1d90f7b844f5d5e074cc7db7.php
	app/cache/dev/twig/9b/5f/cdd9d69bea949d2a4a17e03afa6f977ddafb7034fdcd108e7958dc0c38f0.php
	app/cache/dev/twig/9d/68/5bb514bafd895092e3f626fb144e2f2c55405895fc59b74ad9a8408a192a.php
	app/cache/dev/twig/a8/c2/4ef89f9e2af037e1a8b9c981331deea1e03e694d0075fb1fa8f76d4d9107.php
	app/cache/dev/twig/ac/c4/61bb33d8130ac1fae7072a81d77d242075b949dead51da428088d3de5afa.php
	app/cache/dev/twig/b3/71/2a1d5c3a898b25eea736bcb7a2d5543aab29458e8bf8ab55fd52eca880dc.php
	app/cache/dev/twig/b7/a8/50542e3f31778fdd1ccddabe6af2ac422a1e629bf6ab6840ecbcf4b2bab6.php
	app/cache/dev/twig/b8/b1/8e868939a1bf1146df7130a164db8e8a977884d7a11cf64ff190c54cd170.php
	app/cache/dev/twig/bd/3c/f5d28aa10120cfe150b189f6ee1a496efebac4b4049f086854759247566c.php
	app/cache/dev/twig/c4/20/6325451c2844c28abbc526a3511f6b24306a43cc6d6afc231896e608fbd3.php
	app/cache/dev/twig/db/c1/eb35cacc4ad815635de059c9def4d254c58346db17853f8639acd7602457.php
	app/cache/dev/twig/df/3b/d73500b5ad44d6fd36c43512fb887d2ae48fad685f1623c7e549f08b3fee.php
	app/cache/dev/twig/e3/7c/63c4056d107e8f2b631bacbe417897edab50f6e04d80fddd916b421fac0c.php
	app/cache/dev/twig/e6/82/f8eac227311d88507174a8bd64bd7c765ea3d1c0323e4a7c228a2d0fd103.php
	app/cache/dev/twig/ea/6d/447e6586a73fdaa27ed7039c5602a576f3669c1c7f41499f97ad24f1bb81.php
	app/cache/dev/twig/f2/8f/c0119625bcb1bb1ec6fe17dbbf6ca1fd3d779766d3db57fa6842f77cb5fb.php
	app/cache/dev/twig/f4/7d/9f9fb5b99a099697183ff377f443e49538aac985bca280eb38489510022c.php
	app/cache/dev/twig/f4/82/5b1af977601c131bf68a331d3b73eb41771bcc6d6b98b238fe028e2af64d.php
	app/cache/dev/twig/f7/57/972e73a9e07280c4662cf0be8f302105f1294e50b6509e15e7c110de0885.php
	app/logs/dev.log
	web/bundles/projet/js/script.js
Merge remote-tracking branch 'origin/symfony' into symfony fusion des
branches de la refonte et des autres optionnalitées Zoubi

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/prod/appProdProjectContainer.php
	app/cache/prod/appProdUrlMatcher.php
	app/cache/prod/classes.php
	app/cache/prod/twig/b6/6a/440e6c52b083d669167b5fffeb76bdb467bc450fbf511d8d004d3172fd39.php
	app/logs/dev.log
	app/logs/prod.log
	nbproject/private/private.xml
	src/Bdls/ProjetBundle/Resources/views/Default/404.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/home.html.twig
	src/Bdls/ProjetBundle/Resources/views/Default/layout.html.twig
	web/bundles/projet/css/bootstrap.css
	web/bundles/projet/css/diapazen.css
	web/bundles/projet/css/orangeSoberKit.css