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

.gitignore

src/SpecialForce/SpecialForce.js

src/facilities/nursery/longChildDescription.tw

src/interaction/main/toychest.js

src/interaction/main/useGuard.js

src/js/SlaveState.js

src/js/assayJS.js

src/js/datatypeCleanupJS.js

src/js/descriptionWidgets.js

src/js/extendedFamilyModeJS.js

src/js/slaveCostJS.js

src/js/slaveSummaryWidgets.js

src/js/storyJS.js

src/js/utilJS.js

src/npc/agent/agentCompany.tw

src/npc/agent/agentWorkaround.tw

src/npc/fKiss.tw

src/npc/fRelation.tw

src/player/actions/fCaress.tw

src/player/actions/fEmbrace.tw