VM merge
Merge branch 'master' of https://github.com/kendopunk/ozone-hero
Extviz merge (world map)...homepage update