Merge branch 'combat' into 'pregmod-master'

js/003-data/slaveSummaryData.js

src/002-config/fc-version.js

src/Mods/Catmod/events/SoSSniper.js

src/Mods/Catmod/events/SoSassassin.js

src/Mods/SecExp/events/conflictReport.js

src/Mods/SecExp/js/reportingRelatedFunctions.js

src/Mods/SpecialForce/events/TrickShotNight.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/data/backwardsCompatibility/updateSlaveObject.js

src/endWeek/events/retire.js

src/endWeek/minorInjuryResponse.js

src/endWeek/saGuardYou.js

src/endWeek/saRecruitGirls.js

src/events/PE/peCombatTraining.js

src/events/PE/pePitFight.js

src/events/PESS/pessBodyguardBeatdown.js

src/events/PESS/pessBodyguardBedtime.js

src/events/RE/reAWOL.js

src/events/RE/reBoomerang.js

src/events/RE/reMalefactor.js