fixing for conflict

Conflicts:
	connect-to-door-ios/ConnectToDoor.xcodeproj/project.pbxproj