tags 初步完成
before_morge
tags完善
Merge branch 'suzic' into develop
card搜索排序
Merge branch 'develop' into wk

Conflicts:
	karbao.xcodeproj/project.pbxproj
	karbao/Base.lproj/Main.storyboard
	karbao/CardCollectionViewController.m
	karbao/EditCardTableViewController.m
	karbao/TagViewController.m
	karbao/constants.h
mearge_complete

mearge 完成
Merge branch 'wk' into develop
Merge branch 'develop' into suzic
故事板对齐
切换动画优化／设置界面滑动优化
搜索栏背景
Merge branch 'develop' into suzic