Goodbye starmap :'(
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceStationController.java
	StarMapController.java
	items/Ship.java
	items/Weapon.java
Merge branch 'master' of https://github.com/teamtyn/spacetrader