Adding some easing to the scroller
site stuff
Merge branch 'jellis' into develop