build
demo修改
Merge pull request #4 from chishang/master

Auto merge by kpm server