fixed conflicts
fixing scroll subview
Merge pull request #9 from 8indaas/master

fixing scroll subview