ok
Merge branch 'master' of https://github.com/garinyong/PhoneTools

Conflicts:

PhoneTools.xcodeproj/project.xcworkspace/xcuserdata/garin.xcuserdatad/Us
erInterfaceState.xcuserstate