Merge branch 'master' into jingxian2
Merge branch 'master' into jingxian2
Merge branch 'jingxian2' of http://github.com/bvds/LaitsV3 into jingxian2