Merge remote-tracking branch 'origin/master'

Conflicts:
	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/5d/5deb888b692f44f48bab1173bf4f2cc5
	Library/metadata/71/7191133c6f0004d38b21b0414ed38b16
	Library/metadata/a0/a0fbaea8a485444eeaed6f79a0bbe6a3