tasks some fixes
small fix
Merge branch 'master' of github.com:G-alexandr/IOS

Conflicts:
	src/main/java/org/springframework/samples/petclinic/model/User.java
simple fix
Merge branch 'master' of github.com:G-alexandr/IOS

Conflicts:
	src/main/java/org/springframework/samples/petclinic/web/MainController.java