update demo
re-grunt
Merge pull request #1 from ottomao/master

Auto merge by kpm server