Not ready need to add some stuff
Merge branch 'master' of https://github.com/sidazhang/server