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

devTools/javaSanityCheck/excluded

src/002-config/fc-version.js

src/002-config/sugarCubeConfig.js

src/Mods/DinnerParty/dinnerPartyPreparations.tw

src/Mods/Reminder/reminder.js

src/Mods/SpecialForce/NamingColonel.tw

src/Mods/SpecialForce/TrickShotNight.tw

src/SecExp/attackHandler.tw

src/SecExp/attackOptions.tw

src/SecExp/attackReport.tw

src/SecExp/rebellionReport.tw

src/SecExp/secExpSmilingMan.tw

src/SecExp/tradeReport.tw

src/SecExp/weaponsManufacturing.tw

src/art/assistantArt.js

src/descriptions/arcologyDescription.js

src/endWeek/saRules_old.js

src/endWeek/saServant.js

src/endWeek/saTakeClasses.js

src/events/gameover.tw