merge
Merge branch 'master' of https://github.com/kentran/ZooManicServer
fix kill player