To let Tima work
Fixed things according to Code Review
Merge branch 'master' of https://github.com/skrauchenia/borsch

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/UsersController.java
	borsch-web/src/main/resources/messages.properties
	borsch-web/src/main/webapp/WEB-INF/jsp/userEdit.jsp