Fixed getType in presence
location working

Signed-off-by: Felix Dumit <felix.dumit@gmail.com>
vcard support and echoclient demo
Merge pull request #444 from felix-dumit/location

Support for Location Media Messages
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'
Test for location + fixed downloadable media test
parallel layers now get events sent by a sibling
Fixed #421 CLI usage is unclear

Show command help when no passed arguments
Fixed error after sending 255 msgs, closes #441
Potential fix for not receiving registration sms

refs #382 Registration Cannot be completed - SMS not recieved
refs #326 Request code never arrives.
refs #213 Not receving sms code
refs #171 No registration sms received
refs #147 whatsapp registration sms sent but not received
Ack notifications
fix missing toUpper for location message

Signed-off-by: Felix Dumit <felix.dumit@gmail.com>
Merge pull request #452 from felix-dumit/location

fix missing toUpper for location message
fix issue when using floatin point coordinates

Signed-off-by: Felix Dumit <felix.dumit@gmail.com>
WA 1.5

Upgraded to WA 1.5
Upgraded token dict
Fixed error in iq_error when code is string
Added generate short id
Merge branch 'master' of github.com:tgalal/yowsup
Merge pull request #453 from felix-dumit/location

fix issue when using floatin point coordinates
Fixed getToken not accessing secondary dictionary