add player information in map
merged conflicts
Merge branch 'LevelEditor' of https://github.com/Tadimsky/vooga into LevelEditor