Merge branch 'master' into AFNetworking2.0

Conflicts:
	Example/ExampleTests/XNGOAuthHandlerTests.m
	Tests/Podfile
	Tests/XINGAPIClient Tests.xcodeproj/project.pbxproj
	XNGAPIClient.podspec
	XNGAPIClient/XNGAPIClient.m
	XNGAPIClientExample/XNGAPIClientExample.xcodeproj/project.pbxproj