minor edits
biblio fixes
Merge branch 'security'

Conflicts:
	xdi/xdi-core-1.0/xdi-core-1.0-wd02.xml

xdi/xdi-cryptographic-profiles-1.0/xdi-cryptographic-profiles-1.0-wd01.x
ml