folder support
fixed tests
added child folder attribute so we can navigate both directions
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #266 from daniellemayne/develop

Develop