Manual merge plus fixes.

devNotes/VersionChangeLog-Premod+LoliMod.txt

devNotes/twine JS

readme.txt

src/SecExp/SpecialForceUpgradeOptions.tw

src/SecExp/widgets/unitsWidgets.tw

src/cheats/mod_EditFSCheat.tw

src/js/economyJS.tw

src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw

src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw

src/pregmod/generateChild.tw

src/pregmod/managePersonalAffairs.tw

src/uncategorized/RESS.tw

src/uncategorized/SFMBarracks.tw

src/uncategorized/arcmgmt.tw

src/uncategorized/arcologyDescription.tw

src/uncategorized/costs.tw

src/uncategorized/costsReport.tw

src/uncategorized/manageArcology.tw

src/uncategorized/nextSlaveInLine.tw

src/uncategorized/previousSlaveInLine.tw