Updated armature and factory to use un-merged png, texture xml, and skeleton xml