Merge branch 'CalZoneVUB/master'
Merge pull request #161 from nicocarraggi/nicodev

Nicodev
small edit in comments
Merge branch 'CalZoneVUB/master'
fixed errors from CalZone/master by changing references/imports of CourseTeacherAssociation to CourseComponentUserAssociation and removing method calls to Entry.setEndDate()
Merge pull request #162 from yocoppen/Scheduling

Error fixes for last pull request
TrajectService + ProgramService