initial commit
Merge https://github.com/webantra/sample_app