no commit message
Merge branch 'dev' of https://github.com/ChinaXing/chinaxing.github.com into dev
-- add git ref --