Add element IDs to comment edit and delete buttons

element ID is formed of comment{id}{action}, e.g. comment1delete to match existing control IDs
Resolve merge conflict in comments template