Merge pull request #8 from qatang/dev

Dev
Merge pull request #10 from qatang/dev

Dev
Merge pull request #12 from qatang/dev

cms.properties
Merge pull request #13 from qatang/dev

Dev
Merge pull request #14 from qatang/dev

Dev
Merge pull request #15 from qatang/master

12.19
Merge pull request #16 from qatang/dev

1219
Merge branch 'dev' of https://github.com/qatang/cms into qatang-dev
Merge branch 'qatang-dev'
Merge remote-tracking branch 'remotes/origin/master'
默认角色接口
默认角色接口
Merge pull request #6 from likunpeng06/master

角色管理
merge
merge
Merge pull request #19 from chirowong/master

20141223
角色管理
Merge pull request #8 from likunpeng06/master

角色管理更改
分配资源
500