edit user
Merge branch 'master' of https://github.com/OurInterestSystem/malasong

Conflicts:
	webapp/WEB-INF/jsps/user/user-list.jsp