Test
Merge branch 'master' of https://github.com/srikanthmanian/eShopping

Conflicts:
	webapproot/WEB-INF/lib/wavemaker-common-7.0.0-SNAPSHOT.jar
	webapproot/WEB-INF/lib/wavemaker-json-7.0.0-SNAPSHOT.jar
	webapproot/WEB-INF/lib/wavemaker-runtime-7.0.0-SNAPSHOT.jar
	webapproot/app.variables.json
	webapproot/data/eshopping.properties
	webapproot/pages/Main/Main.html
Added gitignore and renamed images.