fixed bugs in level editor
moved level loading around
merge