Merge branch 'hotfix/nested_comments'
add parent_id to permitted parameters in api comments controller
Merge branch 'hotfix/api_nested_comments' into develop