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

slave variables documentation - Pregmod.txt

src/SecExp/attackHandler.tw

src/SecExp/rebellionReport.tw

src/SecExp/secExpSmilingMan.tw

src/SpecialForce/TrickShotNight.tw

src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw

src/cheats/mod_EditChildCheatNew.tw

src/cheats/mod_EditSlaveCheat.tw

src/cheats/mod_editSlaveCheatNew.tw

src/endWeek/minorInjuryResponse.js

src/endWeek/saServant.js

src/endWeek/saServeThePublic.js

src/endWeek/saWorkTheFarm.js

src/facilities/farmyard/farmyardReport.tw

src/facilities/nursery/childInteract.tw

src/facilities/nursery/longChildDescription.tw

src/facilities/nursery/nurseryReport.tw

src/init/storyInit.tw

src/js/DefaultRules.js

src/js/SlaveState.js