update user controller, added validation
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/user-edit.jsp