add "current planet" and "current solar system" to descriptions to indicate your current location while viewing the maps
Fix range circle and green circle stuff
Fix range circle and green circle stuff
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/GalaxyMapController.java
	SpaceTrader/src/spacetrader/Ship.java
Adjust ship numbers and circle calculation
Merge remote-tracking branch 'origin/master' into sound