Updated templates.
Merge branch 'master' of https://github.com/shubh09/shared