Fixed some Law of Demeter violations in DockController.
ship.addUpgrade() now accepts ShieldType instead of Shield.
Merge branch 'master' of https://github.com/gem-5/last-adventures

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/DockController.java
Added javadocs to fields in Data class.
Refactored AbstractNPC to remove duplicate code in its subclasses.
Fixed no whitespace b/t {} error in Reader files.
Cleaned up unused imports, still like 500 to go...
Only 450 imports left.
Made pirate view file a member of Pirate and included mising import in Reader to merge.