Fix voor JUnit dependency conflict
Merge pull request #214 from yocoppen/Scheduling

small corrections
Merge commit 'f9b140f25b8c8679e1031aeab57bf31614dd4f89' into Scheduler
Merge branch 'CalZoneVUB/Scheduler'