fixed JavadocMethodCheck
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/space/trader/Ship.java