Merge pull request #39 from qatang/dev

hewang_更新20140714_02
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
init
角色更新
Merge pull request #11 from qatang/dev

Dev
shiro issue
Merge pull request #12 from qatang/dev

shiro issue
Merge pull request #13 from qatang/dev

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

cms.properties
Merge pull request #14 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 #15 from qatang/dev

Dev
Merge branch 'dev' of github.com:qatang/cms
完善用户