Admin pwd
Merge branch 'master' of https://github.com/theSage21/orfik

Ratik's updates on the templates.