ticket:5 thumbnailing photo
Merge branch 't5_edit_form'