templator improve; rf
Merge branch 'master' into web_app
state name rf