spawnpoints
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/javascript/game/player.js
Merge remote-tracking branch 'origin/master'