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