Changed javadoc comment and deleted unused class member
Added condition modifiers in planet's getSupply, no modifiers exist for demand.
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.
Planet information now shows up when mousing over a solar system.
Merge remote-tracking branch 'origin/master' into james/dev

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