Finish demo app
Merge https://github.com/VeeSot/demo_app