Merge pull request #166 from svdvonde/master

Room requirements + veranderingen in classrooms waar ik nog aan bezig was
Merge pull request #167 from svdvonde/master

Verbeteringen aan CourseService enz
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