checkout
Merge branch 'caow' of https://github.com/swtlovewtt/yikoudai into caow

Conflicts:
	YiKouDai/YiKouDai.xcodeproj/project.xcworkspace/xcshareddata/YiKouDai.xccheckout
bug fix