MergeFix

devNotes/VersionChangeLog-Premod+LoliMod.txt

devNotes/twine JS.txt

slave variables documentation - Pregmod.txt

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/Mods/DinnerParty/dinnerPartyPreparations.tw

src/SecExp/securityReport.tw

src/SpecialForce/Upgrades.tw

src/art/vector/Head.tw

src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw

src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

src/endWeek/saServant.tw

src/facilities/brothel/brothelAssignmentScene.tw

src/facilities/nursery/childInteract.tw

src/gui/Encyclopedia/encyclopedia.tw

src/init/storyInit.tw

src/js/DefaultRules.tw

src/js/assayJS.tw

src/js/datatypeCleanupJS.tw

src/js/eventSelectionJS.tw