commiting for merge
Merge branch 'images' of https://github.com/bellevik/glory into images
redone worldtmx