First bits on infinite scrolling.
Merge remote-tracking branch 'origin/master'