Updating to fix testing
Merge branch 'cocoapods' of github.com:RobertWalsh/apigee-ios-sdk into origin/cocoapods

Conflicts:
	source/ApigeeiOSSDK.xcodeproj/project.pbxproj
	source/Pods/Pods.xcodeproj/project.pbxproj