NW: Select 1 courses
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
aanvullingen in rules en tests
Merge branch 'CalZoneVUB/master'
IP: Traject Add
IP: Api Traject Posten
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
NW: CourseEdit
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
IP: Edit Course Page
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
W: Edit course front-end
creating massive function for massive contraint
Merge branch 'CalZoneVUB/master'
W: Pagination
verandering van HardSoftScore naar HardSoftLongScore in de scheduler
Merge pull request #172 from yocoppen/Scheduling

Scheduler update
Fixes voor scheduling rules
Merge commit 'beb968e14897606c45a4a27bb6122fae493a5162' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularScoreRules.drl