mislabled as client instead of server
Merge branch 'master' of https://github.com/mistax/SwarchAndroid
made some small changes to get it in line with everything else also renamed