Update HomeController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/pp/melmontazh/web/HomeController.java

Change-Id: If24e713ed3bf966796fb27d1a55bb782c9983d02