add:log
Merge branch 'master' of github.com:wenxiaochen/develop