more work on server app
Merge branch 'server' of https://github.com/TimWSpence/ProjectDev into server