Merge remote-tracking branch 'upstream/develop' into embedded-objects

Conflicts:
	External/diffmatchpatch/DiffMatchPatch.m
	Simperium.podspec
	Simperium.xcodeproj/project.pbxproj
	Simperium/JSONKit+Simperium.h
	Simperium/NSArray+Simperium.m
	Simperium/SPAuthenticator.m
	Simperium/SPBucket.h
	Simperium/SPBucket.m
	Simperium/SPChangeProcessor.h
	Simperium/SPChangeProcessor.m
	Simperium/SPCoreDataExporter.m
	Simperium/SPCoreDataStorage.m
	Simperium/SPDiffer.h
	Simperium/SPDiffer.m
	Simperium/SPIndexProcessor.h
	Simperium/SPIndexProcessor.m
	Simperium/SPManagedObject.h
	Simperium/SPManagedObject.m
	Simperium/SPMember.h
	Simperium/SPMember.m
	Simperium/SPMemberBase64.m
	Simperium/SPMemberDate.m
	Simperium/SPMemberDouble.m
	Simperium/SPMemberEntity.m
	Simperium/SPMemberFloat.m
	Simperium/SPMemberInt.m
	Simperium/SPMemberJSONList.h
	Simperium/SPMemberJSONList.m
	Simperium/SPMemberList.m
	Simperium/SPMemberText.m
	Simperium/SPNetworkInterface.h
	Simperium/SPSchema.h
	Simperium/SPSchema.m
	Simperium/SPWebSocketChannel.h
	Simperium/SPWebSocketChannel.m
	Simperium/Simperium.h
	Simperium/Simperium.m