Patrick level
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Assembly-CSharp-vs.csproj
	Project3/Assembly-CSharp.csproj
	Project3/Library/AssetServerCacheV3
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/InspectorExpandedItems.asset
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/ScriptMapper
	Project3/Library/assetDatabase3
	Project3/Library/expandedItems
	Project3/Library/guidmapper
	Project3/Library/metadata/00/00000000000000003000000000000000
	Project3/Library/metadata/00/0000000000000000b000000000000000
	Project3/Library/metadata/13/1357bad4104e49440a194ebd5a02a98b
	Project3/Library/metadata/1a/1a5c8d9d9500f3a4a89907a5d8af197d
	Project3/Library/metadata/26/2678e695e9e78064597e444e2afef9d9
	Project3/Library/metadata/44/444136cd6a798af4a90a681767dd8fe9
	Project3/Library/metadata/59/59b8e677df427304ca8d9198ab4f2e47
	Project3/Library/metadata/70/70e522ea27606f3478c9765a3c0eec82
	Project3/Library/metadata/7a/7a218be1853ea5941941bffea757f119
	Project3/Library/metadata/85/85ac713adf4728b48b82a62a8ce0e681
	Project3/Library/metadata/92/92a7e67dfbca0b34a9d3081b349c842b
	Project3/Library/metadata/a0/a05aca77d01b34140907d866ffc58c87
	Project3/Library/metadata/b7/b72170d9e15c0614795cb625beb381ae
	Project3/Library/metadata/ba/ba95c9ebf5be8eb4cb3e8d9d8043c4e3
	Project3/Library/metadata/bc/bc4f5913fb53d1e4eaae6ba6ea3ef2db
	Project3/Library/metadata/c3/c3abe0c7ab9d5e04887e3ee3c41e31da
	Project3/Library/metadata/e6/e68bdc2cf0284a14993050c58620f07b
	Project3/Library/metadata/e8/e85c95db84549674e93be0ef2cc29aba
	Project3/Library/metadata/f3/f3bf9f1a05347f64a9d9f2e7f2aecb91
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs
	Project3/ProjectSettings/EditorBuildSettings.asset