Merge remote-tracking branch 'upstream/kaos-galaxy-server' into galaxy-server

Conflicts:
	src/erltrek_ship.erl

Fix phaser_hit processing in erltrek_ship.

Conflicts:
	src/erltrek_galaxy.erl
	src/erltrek_ship.erl

Revive lost merge changes..