fix compilation warning
Merge branch 'master' of https://github.com/cjeffery/sworsorc
move client code back into client folder