Correcting templates
Merge pull request #21 from cividesk/master

Correcting templates