提交一些零碎的修改
Merge branches 'master' and 'wxdev' of github.com:wangxian/app-xchelp into wxdev