Merge branch 'CalZoneVUB/Scheduler'
added javadoc style comments
Merge branch 'CalZoneVUB/Scheduler'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularScoreRules.drl
update
Merge branch 'CalZoneVUB/Scheduler'
Merge pull request #147 from yocoppen/Scheduling

Scheduling update