update templates

update templates
update blog

update blog
Merge branch 'dev'