test

test
Merge branch 'master' of https://github.com/Lrcray/Istone

Conflicts:

IStone_911.xcworkspace/xcuserdata/lrcray.xcuserdatad/UserInterfaceState.
xcuserstate