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

Fix compilation/spelling error with XMPPRoster.m
Merge remote-tracking branch 'upstream/master' into certpinning

Conflicts:
	Vendor/CocoaAsyncSocket
changes for new CocoaAsyncSocket methods