Merge pull request #8 from 8indaas/master

added scrollview and imagepicker
Small tweaks
fixed conflicts
fixing scroll subview