pre merge
Merge remote-tracking branch 'origin/Structure' into Structure

Conflicts:
	core/src/com/deeep/jam/entities/Ship.java
pre merge