update test
Merge branch 'testdoc'
Merge branch 'master' of https://github.com/zhiwen/styleCombine3