minor fixes manual merge

CHANGELOG.md

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

src/Mods/Catmod/events/nonRandom/bodypuristriot.js

src/descriptions/arcologyDescription.js

src/endWeek/economics/reputation.js

src/events/RE/reRelativeRecruiter.js

src/events/RESS/review/masterfulEntertainer.js

src/gui/Encyclopedia/encyclopediaCredits.js

src/gui/options/options.js

src/js/rulesAssistantOptions.js

src/js/utilsDOM.js

src/js/utilsSlave.js

src/js/utilsUnits.js

src/personalAssistant/assistantAppearance.js