infinite scroll is set up
Merge branch 'master' into steve