add content scroller
fix duplicate files
Merge branch 'master' into project
add stats