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

css/facilities/farmyard.css

css/gui/tooltips/textWithTooltip.css

devTools/javaSanityCheck/ignoredVariables

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

js/003-data/gameVariableData.js

js/utils.js

src/002-config/fc-version.js

src/002-config/mousetrapConfig.js

src/004-base/baseEvent.js

src/005-passages/eventsPassages.js

src/005-passages/managePassages.js

src/Corporation/corporate-divisionBase.js

src/Corporation/manageCorporation.js

src/Corporation/manageCorporation.tw

src/Mods/SecExp/attackHandler.tw

src/Mods/SecExp/js/buildingsJS.js

src/Mods/SecExp/terrainAndTactics.js

src/cheats/cheatEditSlave.js

src/data/backwardsCompatibility/backwardsCompatibility.js

src/endWeek/nextWeek/nextWeek.js