3bd27d6ebe
# Conflicts: # ResearchKit/Common/ORKAnswerFormat.m # ResearchKit/Common/ORKAnswerFormat_Internal.h # ResearchKit/Common/ORKDefines.h # ResearchKit/Common/ORKHealthAnswerFormat.m # ResearchKit/Common/ORKHelpers.h # ResearchKit/Common/ORKQuestionStepViewController.m