changes to player entity and world.
Merge pull request #3 from SiriusA/master

changes to player and entity again
Merge pull request #1 from Hriedmarr/master

merge