Fix some bugs
Merge branch 'master' of https://github.com/skrauchenia/borsch

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/UsersController.java