upgrades the production server a bit
merges production master & dev