ticket:5 tests
Merge branch 'master' into t5_edit_page
ticket:5 interim commit
Merge branch 'master' into t5_edit_page
ticket:5 implementation
Merge branch 't5_edit_page'