User modifications
Merge branch 'master' of https://github.com/debflav/scrum

Conflicts:
	src/Override/ScrumBundle/Entity/Cursus.php