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

src/endWeek/brothelReport.js

src/endWeek/clinicReport.js

src/endWeek/masterSuiteReport.js

src/endWeek/reports/arcadeReport.js

src/endWeek/reports/cellblockReport.js

src/endWeek/reports/clubReport.js

src/endWeek/reports/dairyReport.js

src/endWeek/reports/nurseryReport.js

src/endWeek/reports/penthouseReport.js

src/endWeek/reports/spaReport.js

src/endWeek/saLiveWithHG.js

src/endWeek/saRelationships.js

src/endWeek/saSharedVariables.js

src/endWeek/schoolroomReport.js

src/endWeek/servantsQuartersReport.js

src/endWeek/slaveAssignmentReport.js

src/endWeek/standardSlaveReport.js

src/facilities/farmyard/reports/farmyardReport.js

src/js/slaveCostJS.js