Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

Subsurface/Source/DebugConsole.cs

@@ -95,6 +95,7 @@ namespace Barotrauma
                 if (isOpen)
                 {
                     textBox.Select();
+                    AddToGUIUpdateList();
                 }
                 else
                 {
@@ -426,6 +427,14 @@ namespace Barotrauma
                 case "mainmenuscreen":
                 case "mainmenu":
                 case "menu":
+                    GameMain.GameSession = null;
+
+                    List<Character> characters = new List<Character>(Character.CharacterList);
+                    foreach (Character c in characters)
+                    {
+                        c.Remove();
+                    }
+
                     GameMain.MainMenuScreen.Select();
                     break;
                 case "gamescreen":