ios7

ios7
Merge branch 'master' of github.com:answer-huang/shpy

Conflicts:

shpy.xcodeproj/project.xcworkspace/xcuserdata/aiwuhuang.xcuserdatad/User
InterfaceState.xcuserstate