Merge commit 'fa43fa437756e5c89f71e89a8455aa47a66af02f'

# By Andrew Yates
# Via Andrew Yates
* commit 'fa43fa437756e5c89f71e89a8455aa47a66af02f':
  Update SDK to exclude UIActivity

Conflicts:
	Submodules/buffer-ios-sdk
Merge branch 'master' of github.com:ShareKit/ShareKit

# By Andrew Yates (2) and Nikolay Morev (1)
# Via Vilém Kurz (2) and others
* 'master' of github.com:ShareKit/ShareKit:
  Fix compilation warning
  Update ShareKit module to 1.1.2
  Update SDK to ensure deployment target is correct
Merge branch 'master' of github.com:ShareKit/ShareKit

# By Andrew Yates (13) and others
# Via Vilém Kurz (5) and Andrew Yates (1)
* 'master' of github.com:ShareKit/ShareKit:
  Resolve crash with Twitter OAuth when user presses cancel
  Fix expirationDate property type
  Update Twitter sharer to use 1.1 API
  Revert "Unneeded files removed."
  Unneeded files removed.
  Unneeded files removed. "SHKShareItemDelegate.h" added to project.
  Update submodule to latest version
  Define shortenURL method in SHKSharer.h
  Change performSelector to just [self shortenURL]
  Fetch config for requiresShortenedURL
  Add comment for bufferShouldShortenURLS
  Call shortenURL rather than bufferShortenURL (now removed)
  Update Buffer SDK to 1.1.4
  Update SDK to 1.1.3
  Add requiresShortenedURL, also add ability to turn off Buffer Sheet shortening via config.
  Add link shortening methods before presentation of the Buffer Sheet
  Add bufferShouldShortenURLS option