Merge branch 'branchname' into 'pregmod-master'

fc-pregmod.proj

src/Mods/SecExp/buildings/secBarracks.tw

src/Mods/SecExp/edicts.tw

src/Mods/SecExp/js/Unit.js

src/Mods/SecExp/js/secExp.js

src/Mods/SecExp/js/secExpBC.js

src/Mods/SecExp/js/securityReport.js

src/Mods/SecExp/potentialToDo.txt

src/Mods/SecExp/rebellionOptions.tw

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

src/cheats/mod_editSlaveCheatNew.tw

src/data/backwardsCompatibility/backwardsCompatibility.js

src/data/backwardsCompatibility/datatypeCleanup.js

src/descriptions/familySummaries.js

src/endWeek/reports/clinicReport.js

src/events/RETS/reInterslaveBegging.js

src/events/RETS/reSadisticDescription.js

src/events/eventUtils.js

src/events/randomEvent.js

src/events/scheduled/assholeKnight.tw