dd
Merge branch 'master' of https://github.com/AlexanderBSDR/ABSDR_QC

Conflicts:

ABSDR_QC.xcodeproj/project.xcworkspace/xcuserdata/alexanderbilyi.xcuserd
atad/UserInterfaceState.xcuserstate