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
Opstellen test folder
Merge branch 'testing'
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
tussentijdse commit
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'testing'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ClassroomsController.java
Basis voor testing van services
Basis voor testen van services 2
Basis voor testen services 3
Merge pull request #180 from nicocarraggi/nicodev

Find Course By ID Initialized
martboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone