Merged from shihoon
Fix bug in player.js that caused the level editor to crash
More letter
merged to develop