Services bijwerken
Aanpassingen zodat het deleten werkt.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Course.java
	JavaServer/calzone/src/main/java/com/vub/service/FloorService.java
	JavaServer/calzone/src/main/java/com/vub/service/InstitutionService.java
	JavaServer/calzone/src/main/test/com/vub/service/UserServiceTest.java
Merge pull request #189 from nicocarraggi/nicodev

Nicodev