Merge branch 'pregmod-master' into 'pregmod-master'

js/003-data/careers.js

src/endWeek/saNanny.js

src/endWeek/saServant.js

src/gui/Encyclopedia/encyclopedia.tw

src/gui/options/optionsGroup.js

src/interaction/sellSlave.js

src/js/economyJS.js

src/js/slaveCostJS.js

src/npc/descriptions/career.js

src/npc/startingGirls/startingGirls.js

src/npc/startingGirls/startingGirlsPassage.js