Set xml and image extraction with imagename to guid renaming.
Merge pull request #732 from Gravecorp/3.1.x.x

Set xml and image extraction with imagename to guid renaming.