Merge branch 'develop' into suzic
在卡片的显示模式下，不允许卡片向上滑动
显示的手势操作更新／默认素材更新
删掉一个无用View
Merge branch 'wk' into suzic

Conflicts:
	karbao.xcodeproj/project.pbxproj
	karbao/Base.lproj/Main.storyboard
	karbao/CardCollectionViewController.m
Fix a merge error
Merge branch 'suzic' into develop
Merge branch 'develop' into wk