Added Javadocs, cleaned up code.
Fixed all javadoc errors and all warnings except @throw descriptions.
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
Changed conditionals that are checked when travelling to your current universe, and fixed bug where confirmation popup was shown even if there was no name (so it didn't create a character even if you said yes)
added quit button and a warning to save if trying to quit before saving
Refueling is now done by character class and will not let money go negative.
Changed javadoc comment and deleted unused class member
Added condition modifiers in planet's getSupply, no modifiers exist for demand.
Changed the way government types are decided based on tech level. Also fixed bug where you can sell goods for more than you bought them at the same planet. You probably shouldn't use your old save files now.
Removed all unused imports @ TitleController.java
UML class diagram generated from visual paradigm is now in design folder. Deleting save files from the load file menu is now implemented.
Merge because I did work in two different branches on accident.
Took Creston's solution for conditions affecting supply and demand.