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