commited by hitesh
Merge branch 'master' of
https://github.com/cloudzon-chintan/xChangeHotelMain.git

Conflicts:
	SpringSSS/src/main/java/com/demo/controller/HomeController.java
commit