ck 按钮排序

ck 按钮排序
Merge branch '20130730_1' into master-angularfire