no commit message
Merge branch 'master' of github.com:ChinaXing/chinaxing.github.com