some bug fixes and fine tuning
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
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper