Fix client and server
Merge branch 'master' of https://github.com/SC5/devicewall