Nottoyage
Merge branch 'master' of https://github.com/LeBlogger/UEOptionnelles

Conflicts:
	app/logs/dev.log
	src/UEO/ChoixBundle/Entity/Etudiant.php
	src/UEO/ChoixBundle/Form/Type/RegistrationFormType.php
Nettoyage
Nettoyage