by kingda
merge kingda confilct
Merge branch 'master' of https://github.com/BiaoPro/community