Merge commit '3782a1bf24b4a55745b0bdf0d306320aa2ddd5a8'

Conflicts:
	BaasBox-iOS-SDK/BAAClient.h
	BaasBox-iOS-SDK/BAAObject.h
	BaasBoxSDK.podspec
recovered method deleted from merge