Merge branch 'scrollbar_module'
Merge branch 'master' of https://github.com/wilsonfletcher/optiScroll