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

js/003-data/gameVariableData.js

src/004-base/facility.js

src/Corporation/manageCorporation.tw

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/Mods/SecExp/attackHandler.tw

src/Mods/SecExp/attackOptions.tw

src/Mods/SecExp/attackReport.tw

src/Mods/SecExp/encyclopediaSecExpBattles.tw

src/Mods/SecExp/encyclopediaSecExpMain.tw

src/Mods/SecExp/js/secExp.js

src/Mods/SecExp/js/secExpState.js

src/Mods/SecExp/rebellionHandler.tw

src/Mods/SecExp/rebellionOptions.tw

src/Mods/SecExp/rebellionReport.tw

src/cheats/PCCheatMenu.tw

src/cheats/mod_EditSlaveCheat.tw

src/endWeek/endWeek.js

src/endWeek/slaveAssignmentReport.js

src/facilities/farmyard/farmerSelect.tw

src/facilities/farmyard/farmyard.tw