Merge branch 'diplomacy' into 'pregmod-master'

devTools/FC.ts

js/002-config/fc-js-init.js

js/003-data/gameVariableData.js

src/cheats/mod_EditNeighborArcologyCheat.tw

src/js/futureSocietyJS.js

src/js/generateMarketSlave.js

src/js/utilsFC.js

src/neighbor/arcologyDiplomacy.js

src/neighbor/neighborDescription.tw

src/neighbor/neighborDisplay.css

src/neighbor/neighborDisplay.js

src/neighbor/neighborInteract.js

src/neighbor/neighborInteract.tw

src/uncategorized/arcmgmt.tw

src/uncategorized/bulkSlaveGenerate.tw

src/uncategorized/neighborInteract.tw

src/uncategorized/neighborsDevelopment.tw

src/uncategorized/neighborsFSAdoption.tw

src/uncategorized/slaveMarkets.tw