角色更新
Merge pull request #11 from qatang/dev

Dev
Merge pull request #12 from qatang/dev

shiro issue
Merge pull request #13 from qatang/dev

cms.properties
角色更新
Merge pull request #64 from zzqjava/master

权限
properties
Merge branch 'dev' of https://github.com/qatang/cms into dev
Merge pull request #13 from qatang/dev

Dev