vCard adds image/type
Merge branch 'master' of github.com:robbiehanson/XMPPFramework into master-upstream
addAttributeWithName APIs

Closes #272
Merge branch 'master' of https://github.com/robbiehanson/XMPPFramework