updated xml generator
cleaned up xml generator
Merge remote-tracking branch 'origin/XML_tmp' into models