update server & client
Merge branch 'master' of https://github.com/curesteve/PC into curesteve-master
123