by Max
by Max
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/exadel/controller/HomeController.java
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/WEB-INF/jsp/login.jsp
	src/main/webapp/WEB-INF/web.xml