et player id
Merge branch 'master' of https://github.com/benstreb/RPGme

Conflicts:
	src/rpisdd/rpgme/gamelogic/player/Player.java