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

js/003-data/gameVariableData.js

src/data/backwardsCompatibility/BackwardsCompatibility.tw

src/data/backwardsCompatibility/backwardsCompatibility.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/events/intro/initNationalities.tw

src/facilities/farmyard/farmyard.tw

src/facilities/farmyard/farmyardReport.tw

src/facilities/farmyard/food/foodMarket.tw

src/init/storyInit.tw

src/interaction/main/mainLinks.js

src/interaction/slaveInteract.js

src/js/food.js

src/js/generateMarketSlave.js

src/js/generateNewSlaveJS.js

src/npc/fBeg.tw

src/uncategorized/longSlaveDescription.tw

src/uncategorized/newGamePlus.tw

src/uncategorized/nextWeek.tw

src/uncategorized/slaveInteract.tw

src/utility/descriptionWidgetsFlesh.tw