adding templates 4 real
Merge branch 'james'