push templates
Merge branch 'master' into georgiana

a
style changes