Finished demo app
Merge branch 'master' of https://github.com/b3dog/demo_app