Merge branch 'demoDevelop'

Conflicts:

padApp.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserIn
terfaceState.xcuserstate