fixed merge conflicts

xdi-core-1.0-wd02.xml has been broken now for more than two months because of a Github merge conflict that wasn't properly resolved. This is bad, since the TC's front page links to it. I just fixed that.

xdi-cryptographic-profiles-1.0-wd01.xml has been broken as well for the same reason. I resolved this merge conflict too, but there seems to be another error:

XML Parsing Error: prefix not bound to a namespace
Location: http://localhost/xdi-spec-docbook/xdi/xdi-cryptographic-profiles-1.0/xdi-cryptographic-profiles-1.0-wd01.xml
Line Number 325, Column 7:

Not sure Peter if you have time to take a look at that.

Markus