fix conflix
Merge branch 'tmp'
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com
Merge branch 'master' of github.com:bububa/static.xibao.com