Merge branch 'master' of C:\DevelopmentSM\groepI with conflicts.
StopServiceTest