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

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/SecExp/attackReport.tw

src/SecExp/authorityReport.tw

src/SecExp/encyclopediaSecExpMain.tw

src/SecExp/rebellionGenerator.tw

src/SecExp/rebellionReport.tw

src/SecExp/secExpOptions.tw

src/SecExp/secExpSmilingMan.tw

src/SecExp/securityHQ.tw

src/SecExp/securityReport.tw

src/SecExp/tradeReport.tw

src/endWeek/saServant.js

src/events/intro/introSummary.tw

src/events/intro/pcExperienceIntro.tw

src/facilities/nursery/longChildDescription.tw

src/gui/Encyclopedia/encyclopedia.tw

src/interaction/main/mainLinks.js

src/js/descriptionWidgets.js

src/js/economyJS.js

src/js/extendedFamilyModeJS.js