Hmj xml mapper

XML Mapper ready for merge.
I already did a pull origin master