update
Merge branch 'master' of https://github.com/tangzhuo404cn/JDforWechat

Conflicts:

JDforWechat.xcodeproj/project.xcworkspace/xcshareddata/JDforWechat.xcche
ckout