Update aan Scheduler
Merge pull request #185 from yocoppen/Scheduling

Scheduling benchmark config
Merge pull request #186 from yocoppen/Scheduling

Fix file structure
Merge pull request #187 from yocoppen/Scheduling

file extension changes
Meer tests + algemene kleine aanpassingen
Een paar toevoegingen
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
Merge commit '9de6b40e4fc5ade89cdd3cc5252426883db84975' into Scheduler
Merge branch 'master' into Scheduler
Terugkeren van veranderingen in institutionService (die nico had gemaakt >:( ) plus tests terug laten werken
nico zijn if-test corrigeren
Merge pull request #190 from svdvonde/master

Terugkeren van veranderingen in institutionService (die nico had gemaakt...
Kleine aanpassingen + TODO’s
Merge pull request #192 from nicocarraggi/nicodev

Kleine aanpassingen + TODO’s