Merge branch 'wk' into develop
UI 调整
Merge branch 'wk' into develop

Conflicts:
	karbao.xcodeproj/project.pbxproj
	karbao/AppDelegate.m
	karbao/Base.lproj/Main.storyboard
	karbao/CommonPrefix.pch
	karbao/ViewController.m
Fix merge bugs
UI 美化
整理UI：分类、对齐模版等
Merge branch 'wk' into develop

Conflicts:
	karbao.xcodeproj/project.pbxproj
	karbao/Base.lproj/Main.storyboard

karbao/tools/viewcontrollers/collectionlayout/CardListCollectionViewLayo
ut.m
before merge
Merge branch 'develop' into wk
card collection, 手势解锁