ticket:5 fix Makefile
Merge branch 't5_edit_form'