Merge pull request #3 from qatang/dev

Dev
Revert "Dev"
Merge pull request #4 from chirowong/revert-3-dev

Revert "Dev"
Revert "Revert "Dev""
Merge pull request #5 from chirowong/revert-4-revert-3-dev

Revert "Revert "Dev""
Merge branch 'dev' of github.com:qatang/cms into qatang-dev
Merge branch 'dev' of github.com:qatang/cms into qatang-dev
test shiro
update shiro
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	pom.xml
Merge branch 'dev' of github.com:qatang/cms
Merge pull request #8 from qatang/dev

merge
Merge branch 'dev' of github.com:qatang/cms

Conflicts:
	src/main/resources/cms.properties
角色更新
userList
Merge branch 'qatang-dev1'
Merge pull request #51 from zzqjava/master

更新角色
Merge pull request #53 from hewang/master

update index.jsp
Merge branch 'JSHgithub-master' into dev
Merge branch 'dev' of https://github.com/qatang/cms into dev

Conflicts:
	src/main/webapp/index.jsp