update
Merge branch 'master' of https://github.com/poorevil/WeiLingPai

Conflicts:

WeiLingPai.xcodeproj/project.xcworkspace/xcshareddata/WeiLingPai.xccheck
out