Bugfix. Different ways to get raw data depending on image type
Flake 8
Add controlpanel option to update vcards
Merge branch 'master' of https://github.com/collective/collective.xmpp.core

Conflicts:
	collective/xmpp/core/subscribers/startup.py
	docs/HISTORY.txt