refactor
refactor2

Conflicts:
	Servletch5/src/java/model/UserService.java