Merge remote-tracking branch 'origin/infinitescroll'

Conflicts:
	manifest.json