Fixed getType in presence
vcard support and echoclient demo
Merge branch 'master' of github.com:tgalal/yowsup
Merge branch 'vcard' of https://github.com/jerrywhite0/yowsup into jerrywhite0-vcard

Changed Vcard to VCard
Fixed redunant media node in vcard's toProtocolTreeNode
Added test for vcard

Conflicts:
	yowsup/demos/echoclient/layer.py
	yowsup/layers/protocol_media/layer.py
	yowsup/layers/protocol_media/protocolentities/__init__.py
Merge branch 'jerrywhite0-vcard'