slight modifications to server code so that it can speak to the client
Merge branch 'master' of https://github.com/esd-soft-eng/server