made setting template tag gracious
Merge branch 'develop'