Scenery generator
Merge branch 'master' of https://github.com/terier/ioncon
Some fixes