Merge branch 'DJConversion' into 'pregmod-master'

js/003-data/gameVariableData.js

src/002-config/fc-version.js

src/004-base/specialSlavesProxy.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/endWeek/endWeek.js

src/endWeek/healthFunctions.js

src/endWeek/saServeThePublic.js

src/endWeek/slaveAssignmentReport.js

src/js/assayJS.js

src/js/assignJS.js

src/js/economyJS.js

src/npc/descriptions/style/clothing.js

src/uncategorized/PESS.tw

src/uncategorized/RESS.tw

src/uncategorized/club.tw

src/uncategorized/clubReport.tw

src/uncategorized/djSelect.tw

src/uncategorized/randomNonindividualEvent.tw

src/uncategorized/reNickname.tw

src/uncategorized/saRelationships.tw