Merge branch 'folderbranch' into 'pregmod-master'

src/cheats/PCCheatMenu.tw

src/cheats/mod_EditNeighborArcologyCheat.tw

src/endWeek/saChoosesOwnClothes.js

src/js/assayJS.js

src/js/eventSelectionJS.js

src/js/generateGenetics.js

src/js/removeActiveSlave.js

src/js/rulesAssistantOptions.js

src/js/slaveCostJS.js

src/societies/aztec/slaveSacrifice.tw