Fixed cargo capacity bug

Capacity was being displayed incorrectly according to different ship
types
Merged master and local changes