Initial commit
Merge https://github.com/rsaez/demo_app