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 pull request #9 from likunpeng06/master

路径整理
Merge branch 'master' of https://github.com/hewang/cms into hewang-master
Merge branch 'hewang-master'
Merge pull request #22 from chirowong/master

20141226