ticket:5 unittest implemented
ticket:5 edit form implemented
ticket:5 fixes according to comments
ticket:5 master merge