fixed bad world.xml file
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital
fixed dangling tags in world's marshal; added marshalling for icon