Master merge

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/facilities/nursery/longChildDescription.tw

src/init/storyInit.tw

src/js/DefaultRules.js

src/js/SlaveState.js

src/js/assayJS.js

src/js/datatypeCleanupJS.js

src/js/eventSelectionJS.js

src/js/generateGenetics.js

src/js/generateNewSlaveJS.js

src/js/slaveCostJS.js

src/js/slaveSummaryWidgets.js

src/js/utilJS.js

src/npc/acquisition.tw