Removed uid and in-reply-to. Added create-as.
Merge branch 'master' into no-uid

Conflicts:
	collection-sharing.xml
Merge pull request #3 from evert/no-uid

Removed uid and in-reply-to. Added create-as.