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

js/003-data/gameVariableData.js

src/endWeek/minorInjuryResponse.js

src/endWeek/saGetMilked.js

src/endWeek/saNanny.js

src/endWeek/saRest.js

src/endWeek/saServant.js

src/endWeek/saServeThePublic.js

src/endWeek/saWhore.js

src/endWeek/saWorkAGloryHole.js

src/endWeek/saWorkTheFarm.js

src/interaction/budgets/recordTemplates.js

src/interaction/prostheticLab.tw

src/js/economyJS.js

src/js/vignettes.js

src/uncategorized/costsBudget.js

src/uncategorized/dairyReport.tw