cherrypick Make comments editable.
Merge pull request #55 from maartenkling/edit-delete-final

cherrypick Make comments editable in 2.2.x release