fixed unable to enter marketscreen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Space Trader/nbproject/private/private.properties
	Space Trader/nbproject/private/private.xml