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

.gitattributes

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/events/intro/introSummary.tw

src/facilities/nursery/longChildDescription.tw

src/gui/Encyclopedia/encyclopedia.tw

src/init/storyInit.tw

src/js/DefaultRules.js

src/js/assayJS.js

src/js/datatypeCleanupJS.js

src/js/eventSelectionJS.js

src/js/utilJS.js

src/pregmod/seFCTVshows.tw

src/pregmod/widgets/bodyswapWidgets.tw

src/uncategorized/BackwardsCompatibility.tw

src/uncategorized/RESS.tw

src/uncategorized/descriptionOptions.tw

src/uncategorized/longSlaveDescription.tw

src/uncategorized/options.tw

src/uncategorized/pRivalryActions.tw

src/uncategorized/pePitFight.tw