Fixed highscores stuff.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	public/javascripts/asteroids.js