Combat now works against Traders and Pirates. Can also leave after finished.
Added Pirate Controllers.
Merge branch 'master' into sam/dev
Added methods to Ship to add weapons, shields, and gadgets, if there's room.
Added methods to add weapons, shields, gadgets to ships.
Started working towards deprecating LastAdventures.swap().
Added Ship methods to find available slots for weapons, shields, gadgets.
Ship.getNetWorth now takes cargo into account!
Created Controller.transitionTo() method to replace LastAdventures.swap().
Fixed it so that all upgrades can be added to a Ship with Ship.addUpgrade() method.
Controller.transitionTo() works correctly. LastAdventures.swap() is deprecated.
Javadoc'd Controller.transitionTo(), it works exactly the same as swap did.
Checkstyled some classes AbstractCharacter through Good
Set javadoc merge conflicts to be in the right place.