user info update
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:
	WebContent/WEB-INF/jsp/admin/user/info.jsp