before merge
Merge branch 'develop' into wk
card collection, 手势解锁
ignore files
--complete in my think.
complete by week
label旋转
ignore
Merge branch 'wk' of https://github.com/suzic/karbao into wk
ignore settings
Merge OK edition
去掉layout在DataSource中增加的判断方式
Merge branch 'wk' into develop 但是还有错误
代码结构整理
整理代码结构并完成手势返回功能