Merge branch 'pregmod-master' into 'pregmod-master'

src/Mods/Catmod/events/CMRESS/catWorship.js

src/Mods/Catmod/events/CMRESS/spoiledCat.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/endWeek/saSocialEffects.js

src/events/intro/initNationalities.js

src/events/reNickname.js

src/futureSocieties/futureSociety.js

src/js/slaveCostJS.js

src/npc/children/longChildDescription.js

src/npc/descriptions/mouth.js

src/npc/descriptions/skin.js