Merge branch 'CalZoneVUB/master'
CourseComponentUserAssociation
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularTest.java
no message
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
Merge pull request #163 from nicocarraggi/nicodev

TrajectService + ProgramService
TrajectService + ProgramService
Fixes voor rules
Merge commit 'a084b91087127ae1205f09e91114306df1026039' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
classrooms commit
Merge branch 'classrooms'
requirements toegevoegd aan courseComponent
Merge pull request #166 from svdvonde/master

Room requirements + veranderingen in classrooms waar ik nog aan bezig was
Merge commit 'e6cc0d1ceef9c135894b7be247f7c5d609534f99' into Scheduler
Verbeteringen aan CourseService enz
Merge pull request #167 from svdvonde/master

Verbeteringen aan CourseService enz