update
Merge branch 'master' of https://github.com/yakehuang/ios_WZDai

Conflicts:
	WZDai.xcodeproj/project.pbxproj