iPhoneXMPP: always use domain name as expected certificate name
When language is nil retrieve the <body> element with no xml:lang attribute
Merged upstream fixed conflict
vCard adds image/type
Merge branch 'master' of github.com:robbiehanson/XMPPFramework into master-upstream
addAttributeWithName APIs

Closes #272
Merge upstream
Openfire strips namespace 'xml' from 'xml:lang', so check for 'xml:lang' and 'lang' attributes when a body with a specific language is requested.

Removed warning from GCDAsyncSocket as it was already done in https://github.com/robbiehanson/CocoaAsyncSocket
Merges #275
some typos
Merge pull request #276 from sergiosvieira/master

some typos
Fix spelling error
Merge pull request #278 from ChatSecure/rosterfix

Fix compilation/spelling error with XMPPRoster.m
Fixes #283
generateCorrectionMessageWithID API
Remove NSXMLElement APIs
XEP-0191 (blocking)

Adding implementation of XEP-0191 (blocking) based on implementation of
XEP-0016 (privacy)

This extension can do :
- Block jid
- Unblock jid
- Unblock all
- Get blocking list
XEP-0333: Chat Markers
Add support for Google OAuth2
Merge pull request #294 from ChatSecure/X-OAuth2-Google

Add support for Google OAuth2