Runoff bug, icon for app, little bit of code cleanup
Icons being added to trackables
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Assets/Plugins/Android/res.meta
	Assets/Plugins/Android/res/drawable-hdpi.meta
	Assets/Plugins/Android/res/drawable-mdpi.meta
	Assets/Plugins/Android/res/drawable-mdpi/ic_launcher.png.meta
	Assets/Plugins/Android/res/drawable-xhdpi.meta
	Assets/Plugins/Android/res/drawable-xhdpi/ic_launcher.png.meta
	Assets/Plugins/Android/res/drawable-xxhdpi.meta
	Assets/Plugins/Android/res/drawable-xxhdpi/ic_launcher.png.meta
	Assets/Plugins/Android/res/drawable-xxxhdpi.meta
	Assets/Plugins/Android/res/drawable-xxxhdpi/ic_launcher.png.meta
	Assets/StoreScript.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/07/07fb2547e5c7b494c8b5854a352e0009
	Library/metadata/26/260fa62a344043f4393af80139e8787c
	Library/metadata/a7/a718944ac4eacd5419e3c7a7bf8f1476
	Library/metadata/b1/b178cb8159d435c448368f8d3daee19a
	Library/metadata/c5/c5839b77eafabe04eacdde4f0b9f356d
	project.apk