added fields to universe, worked on improving map navigation
merge
Merge origin/master

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

Conflicts:
	SpaceTrader/src/spacetrader/SpaceTrader.java