test3
test4
test5
Merge branch 'master' of https://github.com/we2seek/sales.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/userEdit.jsp