Blou
Merge branch 'master' of https://github.com/LaBrush/KUB

Conflicts:
	src/Kub/EDTBundle/DataFixtures/ORM/LoadCoursData.php