Death and etc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Library/CurrentLayout.dwlt
	Project/Library/CurrentMaximizeLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/ScriptMapper
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/shadercompiler-32bit-1.log
	Project/Library/shadercompiler-64bit-1.log
	Project/Project-csharp.v11.suo
	Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache