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
NW: Select 1 courses
no message
Merge pull request #161 from nicocarraggi/nicodev

Nicodev
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
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
aanvullingen in rules en tests
TrajectService + ProgramService
Merge branch 'CalZoneVUB/master'
Fixes voor rules
Merge commit 'a084b91087127ae1205f09e91114306df1026039' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
IP: Traject Add
classrooms commit
Merge branch 'classrooms'