Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Droplet-csharp.sln
	Droplet.sln
	Droplet.userprefs
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/09/09faae88a57db48bdbef3b86a424df56
	Library/metadata/15/15528fb692ce24b60ba8f62b4805e28f
	Library/metadata/1c/1c4b23b42792b45ba8ecdd48e4b013ae
	Library/metadata/21/21710abba83b674408d062389955a8c9
	Library/metadata/2c/2c44db9353e65423ea833940e6f4a0db
	Library/metadata/36/36a76f9c159284aa8bf960e102ca3d07
	Library/metadata/39/39b04353b0e9cb943be60aed3dcee08b
	Library/metadata/42/42417103ecd58414e8e2716e116a2ba8
	Library/metadata/46/467732f573a854e37977ee3479604f5d
	Library/metadata/4c/4ca15e6c7d14d4adca9e8114eaa0f093
	Library/metadata/59/59ab055d2d5e5481da6fb3980480dff3
	Library/metadata/5b/5b1852a2e4f2b49bbafa13b61aa94e92
	Library/metadata/5d/5d2a58452467e484d9cf7a8e3d588e4b
	Library/metadata/77/77b6b67797b398f47a1d3f471f591337
	Library/metadata/7e/7e43af67e477d48b09bfcf130806d336
	Library/metadata/82/827526c02ec844b3fbd1d9ae16a98be9
	Library/metadata/84/84a0bd02fcaa8874fa7b39532f8e40d3
	Library/metadata/8d/8dc5596225d0e4e50ba769d42860fd9b
	Library/metadata/8e/8e2a3255b5e134e4581e31451462767e
	Library/metadata/92/92af69e17c362c44293fe6cb6844e051
	Library/metadata/92/92e17dd6d3d0bb042adfe190be119109
	Library/metadata/9d/9dd52323851764ba3af1aad76b4edfe4
	Library/metadata/b5/b55b80034b9fc4de4a461b07d9e6ed5a
	Library/metadata/b6/b65fc29fd09f07b4c8346acb7c15440d
	Library/metadata/be/be1468378c997462da4363d89d5edd37
	Library/metadata/be/bec3d6dc5c657814d970896d3acedc83
	Library/metadata/c7/c7abc890f87a46b4994c3dd275a79904
	Library/metadata/c9/c9ca524685caf4a119470147a8cdc58f
	Library/metadata/cf/cf10e5251c1944848b26ae68cf9c4704
	Library/metadata/cf/cf9ddb85ad319455cae6bd983609c9c4
	Library/metadata/d7/d7bde101cbba37946ba6e124f8cb9a83
	Library/metadata/e8/e808f4b6bf0734b62ae37dfc01eb7adb
	Library/metadata/f6/f607e116d29884989a966905f6b60f1b
	Library/metadata/f7/f74d6457a56234b7c82d0922b1e0922f
	Library/metadata/f8/f840a1ff4f25f409ba631420d5a231a8
	Library/metadata/f9/f901bf23f40fb4edfa229528da1a031a
	Library/metadata/fb/fba145b3bdc1e884588c1080da365c9d
droplet controller update