Fix bug.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	examples/realms/entities/player.coffee