HUD points
Merge remote-tracking branch 'origin/master' into hud-points

Conflicts:
	test/core/src/com/test/hud/HUD.java