xsd schema changes in preperation for multifield template matching.
Merge pull request #709 from Gravecorp/3.1.x.x

xsd schema changes in preperation for multifield template matching.