Merge branch 'networking'

Conflicts:
SpaceCOG Client/Library/CurrentLayout.dwlt
SpaceCOG Client/Library/InspectorExpandedItems.asset
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/03/0322d5b52c100c844be4713c8d79720b
SpaceCOG Client/SpaceCOG Client-csharp.sln
SpaceCOG Client/SpaceCOG Client.sln
SpaceCOG Client/SpaceCOG Client.userprefs