undo revert
Merge branch 'release' of https://github.com/srinivasjk/sample-app into release