Merge branch 'PopCap' into 'pregmod-master'

js/003-data/gameVariableData.js

src/Corporation/corporateMarket.tw

src/Mods/SecExp/buildings/secBarracks.tw

src/Mods/SecExp/buildings/securityHQ.tw

src/Mods/SecExp/buildings/weaponsManufacturing.tw

src/arcologyBuilding/manufacturing.js

src/facilities/farmyard/farmyard.js

src/gui/options/options.tw

src/js/assayJS.js

src/markets/JobFulfillmentCenterOrder.tw

src/markets/criminalMarkets.tw

src/markets/customSlave.tw

src/markets/eliteSlave.tw

src/markets/growthResearchInstitute.tw

src/markets/householdLiquidator.tw

src/markets/huskSlave.tw

src/markets/lecoleDesEnculees.tw

src/markets/marketUI.js

src/markets/nuevaUniversidadDeLibertad.tw

src/markets/prestigiousSlave.tw