Ricardo Sánchez-Sáez
2a76ff2a2e
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints
# Conflicts:
# ResearchKit/ActiveTasks/ORKTappingContentView.m
# ResearchKit/ActiveTasks/ORKToneAudiometryContentView.m
# ResearchKit/ActiveTasks/ORKTowerOfHanoiTowerView.m
# ResearchKit/Common/ORKFormItemCell.m
# ResearchKit/Common/ORKHelpers.m
# ResearchKit/Common/ORKScaleSliderView.m
# ResearchKit/Common/ORKSkin.h
# ResearchKit/Common/ORKSkin.m
# ResearchKit/Common/ORKVerticalContainerView.m
# ResearchKit/Consent/ORKConsentReviewController.m
# ResearchKit/Consent/ORKConsentSignatureController.m
# ResearchKit/Consent/ORKSignatureView.m
# Testing/ORKTest/ORKTest/MainViewController.m