Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCOG Client/Assets/Sprites/Thumbs.db.meta
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/5d/5dc9f3bdf075f4e40924936435e96ef5
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
Random commit because I need to sync my remote master to merge