Merge pull request #188 from svdvonde/master

Meer tests + algemene kleine aanpassingen
Services bijwerken
Verbeteringen aan trajecten scraper
Merge commit '8a183d4184524d453fb336a20d58e5289467a6d5'
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
Terugkeren van veranderingen in institutionService (die nico had gemaakt >:( ) plus tests terug laten werken