comprehensive revisions
Merge branch 'master' of https://github.com/jwestgard/DigColl-xml-generator

Conflicts:
	xmlgen2.py