Merge branch 'master' into refactor

src/endWeek/saWhore.js

src/js/PenthouseNaming.js

src/js/assayJS.js

src/js/descriptionWidgets.js

src/js/heroCreator.js

src/js/pregJS.js

src/js/rulesAssistant.js

src/js/sexActsJS.js

src/js/slaveListing.js

src/js/slaveSummaryWidgets.js

src/js/storyJS.js

src/pregmod/birthStorm.tw

src/uncategorized/slaveInteract.tw