ticket:5 fix tests and view
Merge branch 't5_create_form_that_allows_to_edit_data'