Proper icons load for stage 1
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/c7/c7a47dde52079d045bcf353cef2232d5
	project.apk