integrated inifinite scroll refactor
Merge branch 'better_infinite_scroll'