Merge branch 'Branch-1'

Conflicts:

QuotePresentation.xcodeproj/project.xcworkspace/xcuserdata/markward.xcus
erdatad/UserInterfaceState.xcuserstate