added template name and path helpers
Merge remote-tracking branch 'origin/master'