up
Merge branch 'master' of https://github.com/youthcode/QiuTuJianShengPro

Conflicts:

QiuTuJianShengPro.xcodeproj/project.xcworkspace/xcuserdata/WYP.xcuserdat
ad/UserInterfaceState.xcuserstate
up