CommentActivity should allow editting comments if the user has permission to edit.
Fixed merge conflict in CommentActivity