WAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Merge branch 'symfony' of https://github.com/ISEN-CIR3/diapazen into symfony

FUSIOOOOON

Conflicts:
	app/config/parameters.yml
	src/Bdls/ProjetBundle/Controller/PollController.php
	src/Bdls/ProjetBundle/Entity/TextVote.php
	src/Bdls/ProjetBundle/Resources/views/Default/pollCreation.lieu.html.twig