Shop Scene, in progress
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/06/0682a635fa8292b489a6df6f6f02afbf
	Library/metadata/0f/0f8d96e9577a0fd47b33fbd71c72947f
	Library/metadata/13/133df4d6b3eff2e4f80317395a6fc303
	Library/metadata/16/166ea578be24b524c8d0d46afe3f69c7
	Library/metadata/16/16ae95cfb572b684ba84baa079b7706d
	Library/metadata/17/17146bf0da0787f4abcb70259f9cda3f
	Library/metadata/1a/1ada2c1b14d2ab94cb482ba2f97056aa
	Library/metadata/1c/1c7d1073bd741b0478ce5a00b4749375
	Library/metadata/1e/1e8df82a36e288b4bb2073b6a92baaa8
	Library/metadata/1f/1f14ea55a9e3de0468a9a61965f0d926
	Library/metadata/24/241866bbc92eeae48bf73690e9934682
	Library/metadata/25/258ed22cd59527c449a4d013cff6169c
	Library/metadata/29/290c20037b3ca764c88559592566f6d2
	Library/metadata/2c/2c4738d463a2fc345af25146748ea5bb
	Library/metadata/2d/2d018d1325c76d44482d2258311f23f2
	Library/metadata/31/31388d7ab288f9a4e9e0c5e50cafdcfd
	Library/metadata/36/368d457dd1a7f714982f705557c434b1
	Library/metadata/3b/3bbff23dc4a92ae4681afc0636b4f5e6
	Library/metadata/3b/3bffd7f537c32cb4bb8e0121904a02f0
	Library/metadata/3f/3f6e5fbf2d1e5af4f9251cc00b5505d9
	Library/metadata/43/433b5af0b8763d24ea5ff0ad3321094d
	Library/metadata/44/441a3fd7683acc941b0e9a47c9152d7b
	Library/metadata/45/45eeeccc704d86d4784bb2a6131bfea3
	Library/metadata/49/4915534ab5dc77444a4eda440fc9b35c
	Library/metadata/49/497a1acbc4ec0ef4a8a24b80c231c13f
	Library/metadata/4a/4ac46b0b4480f5a4b86048f058e39703
	Library/metadata/4b/4b31338bd65d1ac419dc4dd74262367b
	Library/metadata/4b/4be4d0456bb06f8459b86c36e60373f3
	Library/metadata/54/5468a4fb4302adf4a950a3dfc09a6fdf
	Library/metadata/57/57d107a0098d87142bc62a415540c65f
	Library/metadata/5f/5f8f9c84322b92a49a4d938c8bb9ff04
	Library/metadata/60/601df77ed3b40e14398ae3b39a477080
	Library/metadata/62/62a5cc2adae67c84eb3e88c190ff9143
	Library/metadata/62/62b44b2dca6a9cc489d3df9e4a562136
	Library/metadata/6b/6b08656213ffb214f84ff72fb1bfdef9
	Library/metadata/6b/6b58a7e30f9af5d419375f949ae9bca1
	Library/metadata/72/7278bb9759087a247a67e2b771bd2b3f
	Library/metadata/73/73f7587a05f008e46b264c71ceff7e07
	Library/metadata/7a/7a4bd0ec412b3d141bdf3d0e8e977d23
	Library/metadata/7a/7a4be8102d75839469856a0890fef1a4
	Library/metadata/7d/7d2c5de0be599c3478c5dded8685c9a6
	Library/metadata/7e/7e740b2c18ae6d945b88af3cbf324536
	Library/metadata/7e/7ea0833d651871344910277bbc27e371
	Library/metadata/81/81fc172c5edb20844958df63b90a7c66
	Library/metadata/8b/8b8a1ae57f3fc2648b754e4fc1b5a642
	Library/metadata/8b/8b9518555a9818c4794a89350a55521a
	Library/metadata/8e/8ee7f7b0b89af824ab355543debfdc46
	Library/metadata/92/920493912489e3f47ab9bab3903d4567
	Library/metadata/99/99557482f2b47774fa3b69136fca1256
	Library/metadata/99/99e3f439f5c3c1b4d8adf8b91aaba5dc
	Library/metadata/a0/a07e8dd71d59be4448fd1c463147c9c7
	Library/metadata/a0/a096f435352d8a94580f69747cca6f2a
	Library/metadata/a0/a0ac8568b88132049a6d84c97bb22fa0
	Library/metadata/a0/a0f6de9fc4ad067439658e0084cc8795
	Library/metadata/a1/a11a0230d422c144190e0f0305a9879d
	Library/metadata/a1/a17b57a4e275f0c42a8b00aa80553bc5
	Library/metadata/a7/a718944ac4eacd5419e3c7a7bf8f1476
	Library/metadata/af/af21cdc6ab71aa0469c38501d197dfe0
	Library/metadata/af/afc13cef463daae48a4de4fc8135d898
	Library/metadata/b7/b7bc7fef79fed984a9ef465a135fbb68
	Library/metadata/bb/bb3022ae76ef96948ade21afc0fe89d5
	Library/metadata/be/be71ba8e031a30245a93bc0aea4e4386
	Library/metadata/c1/c195c03134adef84b9d78ec99765730e
	Library/metadata/c1/c1c8ab09ef14f304082d36fb9712c4ef
	Library/metadata/c2/c2bccfd0883e4614bae498664a0fdf3b
	Library/metadata/c5/c5aa1805ee7985742b75e41ab9964702
	Library/metadata/c7/c73a3e57389f7b54285e4488b31ef9af
	Library/metadata/c7/c756069c92df20a4a81a846df70baec4
	Library/metadata/c9/c90ce8acc141e3141a62c585908766e2
	Library/metadata/cb/cb42fd7f118a82141984cf35df3e3ed6
	Library/metadata/cd/cdfad9607ec20464897019edf710220e
	Library/metadata/cf/cf2a07ddcae06c54691da61f60ef1daf
	Library/metadata/d1/d11ef8a7375a77847a2760a10c5cae0a
	Library/metadata/d7/d7143a4d0262e444b812cde08f2841bf
	Library/metadata/d8/d83b59ee58423e64b969d31c88f9b1c3
	Library/metadata/d8/d8f14aaa589c060458c11bcd88e91aff
	Library/metadata/d9/d9a8d1173fcda524586037554700e20e
	Library/metadata/dc/dc5f9397197c2834f89ea93eca17c314
	Library/metadata/dd/dd5af7e873f85bb4986473eb8dd736fd
	Library/metadata/de/decdf0667d6e308499019b904c81d54a
	Library/metadata/e1/e1ee8b038f4121b4680a028b96d1ed39
	Library/metadata/e2/e2dcc8389210ecd4ca23ae4e6a21abc0
	Library/metadata/e5/e5e29363d3beb9241a40bdf0ca4c717f
	Library/metadata/e7/e79c6779b59958644a1303b2b770c775
	Library/metadata/ee/ee5fd8afd661a564d95f82c329dad173
	Library/metadata/f1/f1b0b36a59138a34e9b9dc4699915c66
	Library/metadata/f4/f4354137aa9f23949bf9d4eab08095e6
	Library/metadata/fc/fc72e39106b6478479b262e010c50e30
	Library/metadata/fc/fc8b13a2ece41714daa9ae276927051d
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/guidmapper
	Library/metadata/a7/a718944ac4eacd5419e3c7a7bf8f1476