Syncing

Unimportant changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCOG Client/Assets/MainMenu.unity
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/ac/acc526eb0a1791e4bb0dcc7b4abbba2b
	SpaceCOG Client/Library/metadata/be/be0d31757fa61c64a8d252d4e5516b34
	SpaceCOG Client/Library/metadata/e9/e925d76ae6c59424fa7570d52dda5f29
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln