Correction de bug Formulaire dans modal 1
Merge branch 'development' of http://github.com/ragulan77/athena into development

Conflicts:
	app/config/routing.yml
	src/Ath/UserBundle/Controller/RegistrationClasseController.php
	src/Ath/UserBundle/Form/Type/DisciplineFormType.php
	src/Ath/UserBundle/Resources/config/routing.yml
	src/Ath/UserBundle/Resources/views/Registration/classe.edit.html.twig
Merge pull request #2 from Kuro456/development

Development