Merge branch 'master' into ExtraMercs

Tactical/Squads.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Tactical All.h"
-#else
 	#include "Types.h"
 	#include "Squads.h"
 	#include "Strategic Pathing.h"
@@ -18,7 +15,6 @@
 	#include "screenids.h"
 	#include "Soldier macros.h"
 	#include "GameSettings.h"
-#endif
 #include <vector>
 
 
@@ -1389,6 +1385,11 @@ BOOLEAN IsSquadInSector( SOLDIERTYPE *pSoldier, UINT8 ubSquad )
 		return( FALSE );
 	}
 
+	if( pSoldier->bAssignment == ASSIGNMENT_REBELCOMMAND)
+	{
+		return( FALSE );
+	}
+
 	if( SquadIsEmpty( ubSquad ) == TRUE )
 	{
 		return( TRUE );