manual merge of level stuff, new assets
Updating to master