Merge branch 'pregmod-master' into 'pregmod-master'

src/endWeek/economics/arcmgmt.js

src/endWeek/economics/fsDevelopments.js

src/endWeek/economics/neighborsDevelopment.js

src/js/futureSocietyJS.js

src/markets/bulkSlave/bulkSlaveIntro.js

src/markets/specificMarkets/slaveMarkets.js

src/neighbor/arcologyDiplomacy.js

src/neighbor/neighborDisplay.js

src/neighbor/neighborInteract.js

src/npc/descriptions/sceneIntro.js

src/npc/generate/generateMarketSlave.js