ticket:5 files cleanup
Merge branch 't5_editform'