Liste des matières
Liste des activités par matière
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Eklerni/BackBundle/Controller/ExerciceController.php
	src/Eklerni/CASBundle/Resources/translations/messages.en.xlf
	src/Eklerni/CASBundle/Resources/translations/messages.fr.xlf
	src/Eklerni/CASBundle/Resources/translations/validators.en.xlf
	src/Eklerni/CASBundle/Resources/translations/validators.fr.xlf
	src/Eklerni/DatabaseBundle/Resources/translations/messages.en.xlf
	src/Eklerni/DatabaseBundle/Resources/translations/messages.fr.xlf
Conflits