Added custom template tag(note  to ID)
Merge branch 'dev'