Merge pull request #6 from qatang/dev

Merge pull request #67 from chirowong/master
Merge branch 'master' of https://github.com/chirowong/cms into wzl_dev
Merge branch 'wzl_dev'
userRole
Merge branch 'master' of https://github.com/chirowong/cms into wzl_dev
Failed commit: Failed commit: Default (2)
Merge branch 'master' of https://github.com/hewang/cms into hewang-master
Merge branch 'hewang-master'
fix bug
merge jsh
Merge branch 'jsh-master'
Merge branch 'chirowong-master'