Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

src/004-base/facilityFramework.js

src/budget/repBudget.js

src/endWeek/reports/arcadeReport.js

src/endWeek/reports/brothelReport.js

src/endWeek/reports/cellblockReport.js

src/endWeek/reports/clinicReport.js

src/endWeek/reports/clubReport.js

src/endWeek/reports/dairyReport.js

src/endWeek/reports/farmyardReport.js

src/endWeek/reports/masterSuiteReport.js

src/endWeek/reports/nurseryReport.js

src/endWeek/reports/penthouseReport.js

src/endWeek/reports/schoolroomReport.js

src/endWeek/reports/servantsQuartersReport.js

src/endWeek/reports/spaReport.js

src/endWeek/saStayConfined.js

src/endWeek/standardSlaveReport.js

src/events/eventUtils.js

src/events/recETS/recetsIdenticalHermPair.js

src/events/recETS/recetsIdenticalPair.js