ck更新
Merge branch 'master' of https://github.com/cloutn/dev