Fixed child list to be 100% height
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop