replaced template short tags
Merge pull request #7 from huglester/master

replaced template short tags