Merge branch 'qatang-dev'
Merge branch 'master' of https://github.com/JSHgithub/cms