password reset. part 1
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:
	src/main/java/com/mipt/dcam/laundry/service/UserService.java