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

js/medicine/surgery/face/face.js

js/medicine/surgery/reaction/addForeskin.js

js/medicine/surgery/reaction/addProstate.js

js/medicine/surgery/reaction/retrogradeVirusInjectionNCS.js

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

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

src/Mods/Catmod/events/SoSassassin.js

src/Mods/SecExp/events/conflictHandler.js

src/Mods/SecExp/events/rebellionOptions.js

src/Mods/SecExp/events/rebellionReport.js

src/Mods/SecExp/js/secExp.js

src/cheats/cheatEditSlave.js

src/endWeek/events/expire.js

src/endWeek/events/retire.js

src/endWeek/reports/schoolroomReport.js

src/endWeek/saLiveWithHG.js

src/endWeek/saTakeClasses.js

src/events/PE/peHeadgirlConcubine.js

src/events/PESS/pessWorriedHeadgirl.js

src/events/RE/reAnalPunishment.js