fix bugs
Merge pull request #7 from qatang/dev

merge
fix bugs
merge
fix validators
Merge pull request #9 from qatang/dev

merge
增加忘记密码功能
将查询条件放到session中
角色更新
角色更新
角色更新
角色更新
角色更新
Merge pull request #49 from JSHgithub/master

a new pull request
Merge pull request #50 from zzqjava/master

更新角色
Merge branch 'master' of https://github.com/hewang/cms into hewang-master

Conflicts:
	src/main/java/com/qatang/cms/controller/role/RoleController.java
	src/main/java/com/qatang/cms/controller/user/UserController.java
	src/main/java/com/qatang/cms/dao/role/RoleDao.java
	src/main/java/com/qatang/cms/form/AbstractPagingForm.java
	src/main/java/com/qatang/cms/form/role/RoleForm.java
	src/main/java/com/qatang/cms/service/impl/role/RoleServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/userInput.jsp
	src/main/webapp/WEB-INF/jsp/user/userList.jsp
	src/main/webapp/index.jsp
userList
Merge branch 'qatang-dev1'