Adding support for XML resources
fixed merge conflict
xml support
completed adding xml support, package tidyup