small changes in SpriteGrid
conflict merge
level editor refactoring
merge conflicts resolved