hibernate test
hibernate
Merge branch 'master' into hibernate

Conflicts:
	src/main/java/com/exadel/webtest/userManagement/controllers/WebController.java
	src/main/webapp/WEB-INF/spring/application-context.xml
	src/main/webapp/WEB-INF/spring/servlet-context.xml
	src/main/webapp/WEB-INF/web.xml
Merge fixes.