ticket:6 clean js, edit test
ticket:5 edit fields output in templates
Merge branch 't5_edit_page'