change class
databae
add
add
chnage
class chnage
Merge branch 'master' of
https://github.com/cloudzon-hitesh/xchangehotel_development.git

Conflicts:
	xchangehotel_final/src/main/resources/database.properties
	xchangehotel_final/target/classes/com/demo/controller/HomeController.class
	xchangehotel_final/target/classes/database.properties
	xchangehotel_final/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	xchangehotel_final/target/m2e-wtp/web-resources/META-INF/maven/com.hotel/controller/pom.properties