Correcting schema
Correcting references
Merge branch 'master' of https://github.com/martinthomson/drafts

Conflicts:
	uncertainty/draft-ietf-geopriv-uncertainty.xml