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 nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java