Aanpassingen scheduler
Merge commit 'd388650a479eb8b55bc53879b2ef50c2f5bb08c8' into Scheduler

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