Just wanna sink
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Game2-csharp.sln
	Game2-csharp.v12.suo
	Game2.sln
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache