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
martboard
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge pull request #179 from svdvonde/master

Basis voor testen van services aanwezig
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Course Edit + Json to Object