Merge branch 'master' of github.com:bazaarvoice/bv-ios-sdk

# Conflicts:
#	BVSDK.podspec
#	BVSDK.xcodeproj/project.pbxproj
#	BVSDK/BVCommon/BVAuthenticatedUser.h
#	BVSDK/BVCommon/BVSDKConstants.h
#	BVSDK/BVCommon/BVSDKManager.h
#	BVSDK/BVCommon/BVSDKManager.m
#	BVSDK/BVCommon/Private/BVMultiPart+NSURLRequest.h
#	BVSDK/BVCommon/Private/BVMultiPart+NSURLRequest.m
#	BVSDK/BVConversations/Submission/BVBaseUGCSubmission.h
#	BVSDK/BVConversations/Submission/BVBaseUGCSubmission.m
#	BVSDK/BVConversations/Submission/Photo/BVPhotoSubmission.m
#	BVSDK/BVConversations/Submission/Private/BVBaseUGCSubmission+Private.h
#	BVSDK/BVConversations/Submission/Review/BVReviewSubmission.h
#	BVSDK/BVConversations/Submission/Review/BVReviewSubmission.m
#	BVSDK/BVSDKImports/BVSDK.h
#	BVSDK/Support/Info.plist
#	BVSDKTests/BVIProgressiveSubmitTest.swift
#	BVSDKTests/BVInitiateSubmitTest.swift
#	BVSDKTests/CommonTests/BVUserProfileTests.m
#	BVSDKTests/ConversationsTests/DisplayTests/BulkProductTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/CommentsDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ConversationsDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/FeatureDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/InlineRatingsDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ProductDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ProductTextSearchTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ProfileDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/QuestionDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ReviewDisplayTests.swift
#	BVSDKTests/ConversationsTests/DisplayTests/ReviewFilterDisplayTests.swift
#	BVSDKTests/ConversationsTests/MiscTests/ConversationsTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/AnswerSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/CommentSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/FeedbackSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/PhotoUploadTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/QuestionSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/ReviewSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/StoreReviewSubmissionTests.swift
#	BVSDKTests/ConversationsTests/SubmissionTests/UASSubmissionTests.swift
#	BVSDKTests/MockData/conversations/Submission/testSubmitReviewWithVideoPreview.json
#	BVSDKTests/MockData/curations/curationsEnduranceCycles.json
#	BVSDKTests/MockData/curations/curationsFeedTest1.json
#	BVSDKTests/Support/BVTestUsers.swift
#	Examples/BVSDKDemo/BVSDKDemo/AppDelegate.swift
#	Examples/BVSDKDemo/BVSDKDemo/ProfileUtils.swift
#	Examples/Conversations/Obj-C/ConversationsExample/bvsdk_config_staging.json
#	Examples/Conversations/Swift/ConversationsExample/bvsdk_config_staging.json
#	Examples/ProductRecommendations/Swift/RecommendationsExample/AppDelegate.swift