tpl to new format
Merge branch 'new-design' of git://github.com/oat-sa/extension-tao-delivery into new-design