added parent to row to array
Merge branch 'develop'