Changes related to global vars in shop
Merge branch 'master' of https://github.com/akshayrd/Snowbattle_github_new

Conflicts:
	SnowBattle/tags/SnowBattle_working/.DS_Store