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

src/SecExp/attackReport.tw

src/events/intro/introSummary.tw

src/facilities/farmyard/farmyard.tw

src/facilities/farmyard/saWorkTheFarm.tw

src/gui/Encyclopedia/encyclopedia.tw

src/init/dummy.tw

src/init/storyInit.tw

src/js/datatypeCleanupJS.js

src/js/economyJS.js

src/pregmod/manageCorporation.tw

src/pregmod/manageEconomy.tw

src/uncategorized/BackwardsCompatibility.tw

src/uncategorized/bulkSlaveGenerate.tw

src/uncategorized/buySlaves.tw

src/uncategorized/corporateMarket.tw

src/uncategorized/corporationDevelopments.tw

src/uncategorized/costsBudget.tw

src/uncategorized/economics.tw

src/uncategorized/main.tw

src/uncategorized/manageArcology.tw