Ship and Shipyard: Stopped using the capacity to store the upgrades
Merge branch 'TEMP' into M9