added cancan for the comment
edit delete link on comments
Merge