Fixed bug in ServiceFactory where the DummyService was always returned.
Merge branch 'development' of github.com:hesselmeulenbeld/HUniversal-Production-Utrecht into development