rename parent_id to parent_comment_id in comments
Merge remote-tracking branch 'origin/master'