Revised new form templates.
Merge branch 'master' into development