remove pipe to scrollview from container, was causing error in scrollview
Merge remote-tracking branch 'origin/master'