ignore settings
Merge OK edition
去掉layout在DataSource中增加的判断方式
Merge branch 'wk' into develop 但是还有错误
代码结构整理
整理代码结构并完成手势返回功能
Merge branch 'wk' into develop

Conflicts:
	karbao.xcodeproj/project.pbxproj
	karbao/AddCardViewController.h
	karbao/AddCardViewController.m
	karbao/Base.lproj/Main.storyboard
	karbao/CardCollectionViewCell.h
	karbao/CardCollectionViewCell.m
	karbao/CardCollectionViewController.h
	karbao/CardCollectionViewController.m
	karbao/DATABASE/DataManager+Add.h
	karbao/DATABASE/DataManager+Add.m
	karbao/Subscriber/addcards/CardTemplateCollectionViewController.h
	karbao/Subscriber/addcards/CategoriesViewController.m

karbao/tools/viewcontrollers/collectionlayout/CardListCollectionViewLayo
ut.m