XY
Merge branch 'master' of https://github.com/scholster/QueskeyDev

Conflicts:
	src/Queskey/FrontEndBundle/Entity/Course.php
	src/Queskey/FrontEndBundle/Resources/config/routing.yml