Merge branch 'vcard' of https://github.com/collective/collective.xmpp.core into vcard

Conflicts:
	docs/HISTORY.txt
	setup.py
Merge branch 'vcard' of https://github.com/collective/collective.xmpp.core into vcard

Conflicts:
	setup.py