Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneVUB/master'
minor changes in rules and testing
Merge pull request #174 from yocoppen/Scheduling

Scheduling update
Scheduler Fixes
Merge commit '8a0f57a20697b52c177ee6ad5bd8762f73af4cd6' into Scheduler
Trajecten Scraper
Fixes voor scraper van trajecten.
Merge commit 'b83f85eb8a0995d132157a232a0148435fc0c6e0'
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd