Merge branch 'changes2' into 'pregmod-master'

js/003-data/gameVariableData.js

src/004-base/encyclopediaMap.js

src/005-passages/SpecialUIPassages.js

src/005-passages/eventsPassages.js

src/005-passages/facilitiesPassages.js

src/005-passages/interactPassages.js

src/005-passages/introPassages.js

src/005-passages/managePassages.js

src/005-passages/optionsPassages.js

src/005-passages/slaveMarketPassages.js

src/Mods/Catmod/events/SoSBombing.js

src/Mods/Catmod/events/SoSSniper.js

src/Mods/Catmod/events/SoSassassin.js

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

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

src/Mods/SecExp/events/conflictHandler.js

src/Mods/SecExp/events/conflictOptions.js

src/arcologyBuilding/ManageArcology.js

src/endWeek/endWeek.js

src/endWeek/events/expire.js