Changed prop Xml to be an XElement. Closes #32
Merge branch 'master' of https://github.com/aura-project/aura
Stupid file
Merge branch 'npcs'