ticket:5 adding templates back
Merge branch 't5_edit_page'