ticket:1 edited template
Merge branch 't1'