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

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-vs.csproj
	Assembly-UnityScript-vs.unityproj
	CAPSTN2-Blood-Exile-csharp.sln
	CAPSTN2-Blood-Exile.sln
	Library/CurrentLayout.dwlt
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/24/2440dfadd8aac0d49b9528e6ca779545
	Library/metadata/2a/2a41b575b0d6ce44eaaa9f3f0c3e6588
	Library/metadata/31/310ef35bd2a8b674085f7779e8bbab29
	Library/metadata/31/31f280d2603032d4083c73ea4a8c6420
	Library/metadata/75/7591abc02a8409849b80c81aa588ed29
	Library/metadata/fa/fa7b72600df8def45b5b60a63c242694
	Library/metadata/ff/ff472911c0e38584da85effd299c81d3
	Library/shadercompiler-1.log