Added for server and service save
Merge branch 'master' of https://github.com/otudor/WSTester.git