Merge remote-tracking branch 'upstream/pregmod-master' into duplicated-branches

devTools/FC.ts

js/003-data/gameVariableData.js

js/003-data/slaveSummaryData.js

src/002-config/fc-version.js

src/004-base/specialSlavesProxy.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/descriptions/familySummaries.js

src/endWeek/endWeek.js

src/endWeek/saServant.js

src/endWeek/servantsQuartersReport.js

src/endWeek/slaveAssignmentReport.js

src/gui/css/mainStyleSheet.css

src/interaction/main/walkPast.js

src/js/DefaultRules.js

src/js/assayJS.js

src/js/assignJS.js

src/js/findSlave.js

src/js/generateRelatedSlave.js

src/js/pregJS.js

src/js/slaveSummaryHelpers.js