Changes to main
Merge branch 'master' of https://github.com/srikanthmanian/eShopping

Conflicts:
	.idea/workspace.xml
	webapproot/app.js
	webapproot/data/eshopping.properties
	webapproot/pages/Main/Main.js
Fixed the image flickering issue