Added fatBoy infinite scroller to the Explore Clips page
Fixed merge errors
Merge fixes