Added edit/delete links to comments, not finished yet
Merge branch 'grid'