Update README.markdown
Merge branch 'master' of https://github.com/robbiehanson/XMPPFramework

Conflicts:
	Extensions/Roster/XMPPRoster.h
	Extensions/XEP-0012/XMPPLastActivity.h
	Extensions/XEP-0012/XMPPLastActivity.m
	Extensions/XEP-0054/XMPPvCardTempModule.m
	Vendor/libidn/libidn.a
Merge branch 'develop'

# By Spencer MacDonald (18) and others
# Via Sean Batson (5) and Spencer MacDonald (2)
* develop: (32 commits)
  Removed redundant queue specific checks
  #190 Returned type unsigned int causes -1 return by some servers or clients to be seen as an excessive last seen time. Fix posted in pull request.
  Some servers return -1 this must be evaluated before assigning NSNotFound
  few bug fixes to latest source branch
  Delegate Refactor Missed a File
  XMPPSystemInputActivityMonitor
  Roster APIs
  Code Clean Up
  Google Shared Status
  Create XMPPSharedStatus.m
  Create XMPPSharedStatus.h
  XMPPRosterStorage should only create users from presence if XMPPRoster allowRosterlessOperation is YES
  XMPPIDTrackerTimeoutNone const
  Variables the Wrong Way Round
  XEP-0297: Stanza Forwarding
  XEP-0059: Result Set Management
  Rename BOOL
  NSXMLElement xmlns prefix APIs
  XEP-0184
  XMPPStream enumerateModulesOfClass: withBlock: API
  ...

Conflicts:
	README.markdown
	Vendor/libidn/libidn.a
addio
Merge branch 'master' of https://github.com/robbiehanson/XMPPFramework

# By Spencer MacDonald (24) and others
# Via Spencer MacDonald (7) and Sérgio Vieira (1)
* 'master' of https://github.com/robbiehanson/XMPPFramework: (37 commits)
  Bug Fix: Message value on XMPPRoomMessageHybridCoreDataStorageObject is not saving on CoreDate
  Bug Fix: Message value on XMPPRoomMessageCoreDataStorageObject is not saving on CoreDate
  XEP-0045 Code Clean Up
  XEP-0045: added methods to XMPPMessage category to handle room subjects, have XMPPRoom check incoming messages for room subjects and use them to set the roomSubject property
  registerWithElements:error API
  Initialize Variable
  xmppRoster:didReceiveRosterPush: API
  copyWithZone added to XMPPIQ, XMPPMessage and XMPPPresence
  Fix a bug. Adding the copyWithZone within the XMPPPresence. Now the copied object is a XMPPPresence instance.
  Analyser Warnings
  Prefix NSNumber XMPP category methods
  Prefix NSData XMPP category methods
  Rename LibIDN to XMPPStringPrep
  XEP-0106: JID Escaping
  XMPPStream Did Fail to Send APIs
  XMPPMessage Thread APIs
  XMPPRoom sendMessage => sendMessageWithBody
  Received Typo
  Update XMPPRoomCoreDataStorage.m
  Add "id" attribute into the bind resource iq
  ...

Conflicts:
	Extensions/XEP-0012/XMPPIQ+LastActivity.m
Merge branch 'master' into develop

# By adozenlines
# Via Sean Batson (3) and adozenlines (1)
* master:
  Update README.markdown

Conflicts:
	README.markdown