updated client to put ID in data
merge from client
Merge branch 'master' of github.com:nocow4bob/pingc2