ci local

ci local
Merge branch 'master' of https://github.com/hanyee/btle

Conflicts:

BTLE_PAY_DEMO/BTLE_PAY_DEMO.xcodeproj/project.xcworkspace/xcuserdata/han
yee.xcuserdatad/UserInterfaceState.xcuserstate