Added demo app
Merge branch 'demo-app'