handle childviews / no childviews in update()
Merge branch 'master' into ui