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
IP: Schedular Dashbaord
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
IP: Schedular Dashboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Opstellen test folder
Merge branch 'testing'
HALF WERKENDE Services: nog niet alle lazy calls enz opgelost.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #178 from nicocarraggi/nicodev

Nicodev
Basistests toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'testing'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/service/UserService.java
Saving Trajects
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd