added hints for templates
Merge branch 'prep-for-prod'