MergeFix

.eslintrc.json

devNotes/VersionChangeLog-Premod+LoliMod.txt

slave variables documentation - Pregmod.txt

src/SecExp/propagandaHub.tw

src/SecExp/riotControlCenter.tw

src/SecExp/secBarracks.tw

src/SecExp/securityHQ.tw

src/SpecialForce/Proposal.tw

src/art/vector/VectorArtJS.js

src/cheats/mod_EditChildCheatNew.tw

src/cheats/mod_EditSlaveCheat.tw

src/cheats/mod_editSlaveCheatNew.tw

src/endWeek/saServeThePublic.js

src/facilities/brothel/brothelAssignmentScene.tw

src/facilities/penthouse/penthouseFramework.js

src/facilities/schoolroom/schoolroomFramework.js

src/gui/mainMenu/AlphaDisclaimer.tw

src/js/SlaveState.js

src/js/economyJS.js

src/js/generateMarketSlave.js