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

devTools/javaSanityCheck/SanityCheck.jar

devTools/javaSanityCheck/excluded

devTools/javaSanityCheck/htmlTags

devTools/javaSanityCheck/sources.zip

src/002-config/mousetrapConfig.js

src/003-assets/CSS/tooltip.css

src/data/backwardsCompatibility/backwardsCompatibility.js

src/endWeek/saGetMilked.js

src/endWeek/saServeThePublic.js

src/endWeek/saWhore.js

src/endWeek/saWorkAGloryHole.js

src/endWeek/saWorkTheFarm.js

src/facilities/ads.js

src/facilities/nursery/nursery.tw

src/facilities/nursery/widgets/utils/nurseryUtils.js

src/gui/options/options.tw

src/gui/tooltips.js

src/js/assayJS.js

src/js/extendedFamilyModeJS.js

src/js/futureSocietyJS.js