files and structure needed for infinite scrolling of klips. Needs to be tested
Merge remote-tracking branch 'origin/master'