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

src/004-base/facility.js

src/endWeek/saWhore.js

src/facilities/arcade/arcadeFramework.js

src/facilities/armory/armoryFramework.js

src/facilities/brothel/brothelFramework.js

src/facilities/cellblock/cellblockFramework.js

src/facilities/clinic/clinicFramework.js

src/facilities/club/clubFramework.js

src/facilities/dairy/dairyFramework.js

src/facilities/farmyard/farmyardFramework.js

src/facilities/headGirlSuite/headGirlSuiteFramework.js

src/facilities/masterSuite/masterSuiteFramework.js

src/facilities/nursery/nurseryFramework.js

src/facilities/penthouse/penthouseFramework.js

src/facilities/pit/pitFramework.js

src/facilities/schoolroom/schoolroomFramework.js

src/facilities/servantsQuarters/servantsQuartersFramework.js

src/facilities/spa/spaFramework.js

src/init/setupVars.tw

src/js/assignJS.js