Merge branch 'CalZoneVUB/Scheduler'
update test met check op uiteindelijke score
Merge branch 'CalZoneVUB/master'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
unexplained copies of Institution.java removed
Merge branch 'CalZoneMaster'
error fixes
Merge branch 'CalZoneVUB/Scheduler'
invoer logback
logback xml configuration
Merge pull request #153 from yocoppen/Scheduling

Logback integration
Aanpassingen scheduler
Merge commit 'd388650a479eb8b55bc53879b2ef50c2f5bb08c8' into Scheduler

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