Comment out some methods, add some resource file
Merge remote-tracking branch 'origin/LevelEditor'