Level editor

Tentative merge of our branch nearest to master - the level editor