checkstyle
Merge origin/master

Conflicts:
	src/space/trader/Character.java