added diabled cancel
Merge remote-tracking branch 'origin/gh-pages' into kiosk-demo
merged alpha-0.6
Merge pull request #3 from touhonoob/kiosk-demo

merged alpha-0.6