Cleaned up code.
Added NPC superclass to Pirate, Police, & Traders
Fixed planet screen showing up when an out of range planet is clicked. Turns only pass when a in range system which the player is not located is clicked.
commit before merge w/ master.
Merge branch 'master' into sam/dev
Encounters happen when travelling.

Conflicts:
	src/main/java/edu/gatech/gem5/game/Ship.java
Bugfix: Fixed two bugs concerning character creation.
Added Javadocs, cleaned up code.
Fixed all javadoc errors and all warnings except @throw descriptions.
Took Sam's encounter enabled solution.
Implemented dynamic range drawing in DisplayUniverse based on a new field fuel in Ship classPurchasing more fuel can be done in the MarketPlace, but should be moved to the shipyard
Merge branch 'sam/dev', fixed all javadoc errors

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/EncounterController.java
Added shipyard button @ planet.fxml
Initial Menu Bar Commit @ RootMenuLayoutController.java &
RootMenuLayout.fxml
Merge remote-tracking branch 'origin/master' into james/dev
Fixed bug with the number 20 on character create screen
Fixed bug that said the current solar system was out of range. It now returns you to the planet screen.
Persistance is a go. Commence saving games. Also moved the refuel button to the planet controller.
Merge branch 'master' of https://github.com/gem-5/last-adventures into creston/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/DisplayUniverseController.java