update t&m template
Merge branch 'dev'