Merge branch 'develop' into pdeschain/structure-refactor-1-asmdefs-and-folder-changes

# Conflicts:
#	Assets/BossRoom/Scripts/Gameplay/ConnectionManagement/ClientGameNetPortal.cs

Author: pdeschain

Assets/BossRoom/Scripts/Gameplay/ConnectionManagement/ClientGameNetPortal.cs

@@ -157,6 +157,7 @@ private void OnDisconnectOrTimeout(ulong clientID)
                     case ConnectStatus.UserRequestedDisconnect:
                     case ConnectStatus.HostEndedSession:
                     case ConnectStatus.ServerFull:
+                    case ConnectStatus.IncompatibleBuildType:
 
                         m_QuitGameSessionPub.Publish(new QuitGameSessionMessage() { UserRequested = false }); // go through the normal leave flow
                         break;