Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/player/Ship.java
Merge origin/master