User view modified
Merge branch 'master' of https://github.com/JoyDnUa/employment

Conflicts:
	src/main/java/com/exadel/expertgroup/employment/controller/UserController.java
	src/main/webapp/WEB-INF/templates/fragments/common.html