Merge pull request #17 from daniellemayne/develop

bugzid 3383: delete service if error occurs on server launch (develop)
merged pull request #18 into develop
Merge pull request #19 from SlavD/develop

merged pull request #18 into develop