Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1021-48

See merge request !846

src/uncategorized/SFMBarracks.tw

@@ -326,7 +326,6 @@
 			<</link>> // Costs ¤3750000 //<br>
 		<<elseif $securityForceSpacePlanePower == 9>>
 				//The $securityForceName's SpacePlane is fully upgraded.//<br><</if>>
-		<</if>>
 		
 		<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceFortressZeppelin < 1>>
 				<<link "Ask The Colonel to 'borrow' a Fortress Zeppelin">>
@@ -372,7 +371,6 @@
 			//The $securityForceName drone fleet is fully upgraded.//<br>
 			<<else>>
 			//More barracks infrastructure upgrades are needed before the drone fleet can be expanded.//<br><</if>>
-		<</if>>
 
 		<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5>>
 			<<if $securityForceSatalitePower < 1>>