Ricardo Sánchez-Sáez
cfe04441ad
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
# ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
# ResearchKit/Charts/ORKGraphChartView.m
# ResearchKit/Charts/ORKRangedPoint.m
# ResearchKit/Common/ORKHealthAnswerFormat.m
# ResearchKit/Common/ORKNavigableOrderedTask.m
# ResearchKit/Common/ORKOrderedTask.m
# ResearchKit/Common/ORKPasscodeStepViewController.m
# ResearchKit/Common/ORKSurveyAnswerCellForText.m
# ResearchKit/Common/ORKTextButton.h
# ResearchKit/Common/ORKTextFieldView.m
# Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m