Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

devTools/AutoGitVersionUpload.sh

src/SecExp/edicts.tw

src/SecExp/rebellionOptions.tw

src/SecExp/secBarracks.tw

src/SecExp/widgets/unitsWidgets.tw

src/pregmod/SecForceEX/SpecialForceColonelSexDec.tw

src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw

src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw

src/pregmod/SecForceEX/securityForceTradeShow.tw

src/pregmod/incubator.tw

src/uncategorized/SFMBarracks.tw

src/uncategorized/arcade.tw

src/uncategorized/buildingWidgets.tw

src/uncategorized/cellblock.tw

src/uncategorized/clinic.tw

src/uncategorized/dairy.tw

src/uncategorized/manufacturing.tw

src/uncategorized/masterSuite.tw

src/uncategorized/pens.tw

src/uncategorized/schoolroom.tw