ticket:8 finished
ticket:10 Merge branch 'TT_#8' into TT_#10
updated templates