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