Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GUI/LoadingScreen.cs

Subsurface/Source/GameSession/GameSession.cs

@@ -376,6 +376,8 @@ namespace Barotrauma
         public void Update(float deltaTime)
         {
             TaskManager.Update(deltaTime);
+
+            if (GUI.DisableHUD) return;
             
             //guiRoot.Update(deltaTime);
             infoButton.Update(deltaTime);
@@ -387,6 +389,8 @@ namespace Barotrauma
 
         public void Draw(SpriteBatch spriteBatch)
         {
+            if (GUI.DisableHUD) return;
+
             infoButton.Draw(spriteBatch);
             
             if (gameMode != null)   gameMode.Draw(spriteBatch);