Merge pull request #189 from nicocarraggi/nicodev

Nicodev
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...