metrics
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/metadata/26/260fa62a344043f4393af80139e8787c
	Library/metadata/c7/c7a47dde52079d045bcf353cef2232d5
	Library/metadata/fc/fc251d1ad08007847b0805cfec862b2a
	project.apk