Replaced image view with scroll view.
Merge branch 'master' into AlexLocal