handle both xs and xsd prefixes
Merge branch 'master' of https://github.com/gmoyanollc/gappware