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

in arcmgmt, nicaeaFocus should be owners, not slaveowners

See merge request !5284

src/uncategorized/arcmgmt.tw

@@ -551,7 +551,7 @@ _enslaveChance = 0.2>>
 		_lowerClassP *= 1 + $nicaeaPower * 0.005,
 		_topClass += $nicaeaPower * -2.5,
 		_topClassP *= 1 + $nicaeaPower * -0.005>>
-	<<elseif $nicaeaFocus == "slaveowners">>
+	<<elseif $nicaeaFocus == "owners">>
 		<<set _slaveDemandU *= 1 + $nicaeaPower * 0.05,
 		_slaveDemandT *= 1 + $nicaeaPower * 0.0625,
 		_lowerClass += $nicaeaPower * -100,