Pulling in some changes to the demo
Merge branch 'master' into feautre-IntentsApi