Merge pull request #39 from qatang/dev

hewang_更新20140714_02
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'
Merge pull request #4 from qatang/dev

7.17merge
Merge pull request #5 from qatang/dev

7.17
菜单管理修改
Merge branch 'dev' of github.com:qatang/cms into qatang-dev
遍历菜单页面
菜单管理7.24
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 pull request #10 from qatang/dev

merge dev