updated template to support fornt editing
Merge branch '2.3-front-editing'