updates to client/server
Merge branch 'master' of github.com:biblicabeebli/dvpn