mod some function
Fix some wap bugs
Merge branch 'master' of https://github.com/nnjme/reindeer_server