no message
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Assets/Main.cs
	Library/assetDatabase3
	Library/metadata/26/260fa62a344043f4393af80139e8787c