Merge branch 'refactor' into 'pregmod-master'

src/endWeek/saNanny.js

src/endWeek/saRest.js

src/endWeek/saServant.js

src/endWeek/saServeThePublic.js

src/endWeek/saStayConfined.js

src/endWeek/saWhore.js

src/endWeek/saWorkAGloryHole.js

src/endWeek/saWorkTheFarm.js

src/interaction/main/toychest.js

src/interaction/main/useGuard.js

src/js/assayJS.js

src/js/assignJS.js

src/js/extendedFamilyModeJS.js

src/js/futureSocietyJS.js

src/js/generateGenetics.js

src/js/generateMarketSlave.js

src/js/hTagMacroJS.js

src/js/quickListJS.js

src/js/sexActsJS.js

src/js/slaveListing.js