Merge commit '5238e37b1e8f54ac32c91b86bf13d844a4b795c2'

Conflicts:
	ShareKit.xcodeproj/project.pbxproj (reverse-merged from commit 4629d876fc0fcd3e7c5e35d7111e014b2a53622f)