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