Merge pull request #38 from vcnickerson/mattj/dev

Fixed some marketplace bugs
Ship purchasing implemented.
Merge branch 'Ian/active'
Changes
Little things
Added Shipyard Navigation
Fixed some shipyard controller stuff
Merge pull request #40 from vcnickerson/Connor3

Fixed some shipyard controller stuff
Incremental update to Shipyard Screen Controller. Combined ship/utility purchasing tabs. Removed onKeyboard() from ControlledScreen because we don't need it. Added new method to iShipUtility for modelers to define properly.
Merge pull request #41 from vcnickerson/Ian/active

Incremental update to Shipyard Screen Controller. Combined ship/utility ...
Added methods to get arrays of ship utilities
Merge pull request #42 from vcnickerson/Connor3

Added methods to get arrays of ship utilities
NullPlanet fulfills Null Object design pattern
Removed commented out code
Merge pull request #43 from vcnickerson/VN/DesignPattern

NullPlanet fulfills Null Object design pattern
Added gadgets, adjusted travel, added descriptions
Merge branch 'Connor3'
Merge stuff?

Hopefully this works?
Forgot to commit
FOrgot to merge