Basic template delivery
Merge branch 'master' of https://github.com/sudheesh001/vibe