Add player id to entities
Merge branch 'master' of github.com:bartwe/ardust

Conflicts:
	entities.dat