Working on masonry
merged master on cancan branch
added cancan for the comment
edit delete link on comments
Fixed weird act_as_votable nil bug
Merge