Big Push. Shop done-ish, no more experience bar or levelups.
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Resources/Thumbs.db.meta
	Assets/Resources/images/CategoryImages/Thumbs.db.meta
	Assets/Sample pictures/Thumbs.db.meta
	Assets/Thumbs.db.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/0f/0f8d96e9577a0fd47b33fbd71c72947f
	Library/metadata/a7/a718944ac4eacd5419e3c7a7bf8f1476
	Library/metadata/fc/fc251d1ad08007847b0805cfec862b2a
	project.apk