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

Conflicts:
	src/main/webapp/WEB-INF/jsp/user/userList.jsp
	src/main/webapp/index.jsp