Fixed vote/comment bug
Merge branch 'develop'