NW: Select 1 courses
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
aanvullingen in rules en tests
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
IP: Api Traject Posten
Merge commit 'e6cc0d1ceef9c135894b7be247f7c5d609534f99' into Scheduler
W: Goto edit course page
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
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
IP: Edit Course Page
Merge pull request #170 from svdvonde/master

[WERKEND] Course-Teacher relatie zou nu moeten werken...
EGER fetch course

Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ApiCourse.java
	JavaServer/calzone/src/main/java/com/vub/controller/ApiTraject.java
Toevoegen van Room equipment rules
Merge commit '3ab17797e093e3122d2890b2d84ea0d926af078c' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
W: Edit course front-end