Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

devTools/Script to convert SC to JS/SC to JS 1.py

devTools/concatFiles.bat

js/003-data/gameVariableData.js

src/002-config/fc-version.js

src/Mods/SecExp/buildings/secBarracks.tw

src/Mods/SecExp/buildings/weaponsManufacturing.tw

src/Mods/SecExp/js/Unit.js

src/Mods/SecExp/js/buildingsJS.js

src/Mods/SecExp/js/secExp.js

src/Mods/SecExp/rebellionHandler.tw

src/Mods/SecExp/rebellionReport.tw

src/Mods/SecExp/securityReport.tw

src/Mods/SecExp/unitsRebellionReport.tw

src/arcologyBuilding/markets.js

src/endWeek/endWeek.js

src/gui/Encyclopedia/encyclopedia.tw

src/interaction/main/mainLinks.js

src/markets/market.tw

src/markets/marketUI.js

src/markets/specificMarkets/criminalMarkets.js