1
Merge branch 'master' of https://github.com/maqizhao/mobileLib_Ios

Conflicts:

MoblieLib/MoblieLib.xcodeproj/project.xcworkspace/xcuserdata/cqvip.xcuse
rdatad/UserInterfaceState.xcuserstate