Finish demo app
Merge branch 'master' of https://github.com/kjeremy/demo_app