Merge pull request #4 from qatang/dev

7.17merge
Merge pull request #5 from qatang/dev

7.17
菜单管理修改
遍历菜单页面
菜单管理7.24
Merge pull request #8 from qatang/dev

merge
Merge pull request #10 from qatang/dev

merge dev
角色更新
userList
Merge branch 'qatang-dev1'
test index.jsp
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
Merge branch 'master' of https://github.com/chirowong/cms into chirowong-master

Conflicts:
	src/main/resources/cms.properties
Merge pull request #54 from chirowong/master

test
test
delete properties
menu