Fixes voor rules
Merge commit 'a084b91087127ae1205f09e91114306df1026039' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
Merge commit 'e6cc0d1ceef9c135894b7be247f7c5d609534f99' into Scheduler
Toevoegen van Room equipment rules
Merge commit '3ab17797e093e3122d2890b2d84ea0d926af078c' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
W: Pagination
Merge pull request #172 from yocoppen/Scheduling

Scheduler update
Fixes voor scheduling rules
Merge commit 'beb968e14897606c45a4a27bb6122fae493a5162' into Scheduler

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/junit/SchedularTest.java
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularScoreRules.drl
Merge commit '563e631b36862762363a9c9a5e98fdf664245da4' into Scheduler
Oplossen van errors na merge.
Merge pull request #173 from MPieter/master

Update van Scheduler
Merge branch 'CalZoneVUB/master'