fix userRoleInput.jsp
fix UserController.java
Merge branch 'master' of https://github.com/chirowong/cms into chirowong-master
Merge branch 'chirowong-master'
revert UserController.java
shiro 添加
fix user
fix userList.jsp
Merge pull request #15 from JSHgithub/master

a new pull request for chirowong
Merge pull request #76 from chirowong/master

merge everybody to qatang
some changes
Merge pull request #26 from qatang/master

20141231