fixed mercenaries
Merge origin/master

Conflicts:
	src/spacetrader/Universe.java