Finish demo_app
Merge branch 'master' of https://github.com/thesantosh/demo_app