trying to fix xcode
Merge branch 'master' into parsekit

Conflicts:
	mongo-objc-driver.xcodeproj/project.pbxproj
xcode should be fixed
Merge branch 'master' into parsekit

Conflicts:
	mongo-objc-driver.xcodeproj/project.pbxproj
working