refactoring
Merge branch 'dev_level' into dev_main

Conflicts:
	src/com/example/ship/game/GameHUD.java