Cherry-pick from develop
-noté
Merge branch 'legacy-master' into develop

Conflicts:
	api/v1/cours.rb
	public/app/js/controllers/EmploiDuTempsCtrl.js