[merge] add infinite scroll stuff to master