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

Conflicts:
	Prototype/Library/CurrentLayout.dwlt
	Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll
	Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Prototype/Library/assetDatabase3
	Prototype/Library/guidmapper