Dev commit
Dev update
Dev update
Dev update
Dev update
Dev-update
dev update
dev update
Dev build final update
Merge branch 'Dev-build'

Conflicts:
	gShop.full.js
	gShop.min.js
	userData.js