pulled scroll bug fix from dev
Merge branch 'master' of github.com:ds300/jetzt