NW: Select 1 courses
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
IP: Traject Add
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
IP: Api Traject Posten
W: Goto edit course page
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
no message
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
Merge pull request #168 from nicocarraggi/nicodev

Nicodev
[NIET WERKEND] maar nodig voor tim
Merge pull request #169 from svdvonde/master

[NIET WERKEND] maar nodig voor tim
NW: CourseEdit
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
[WERKEND] Course-Teacher relatie zou nu moeten werken...