Merge branch 'CalZoneVUB/master'
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
Merge pull request #163 from nicocarraggi/nicodev

TrajectService + ProgramService
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
Verbeteringen aan CourseService enz
Merge pull request #167 from svdvonde/master

Verbeteringen aan CourseService enz
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ApiCalendar.java
	JavaServer/calzone/src/main/java/com/vub/controller/CourseInformationController.java
	JavaServer/calzone/src/main/java/com/vub/model/Room.java
	JavaServer/calzone/src/main/resources/logback.xml