merge
Merge branch 'master' of https://github.com/Lukeisme/onepageScroll-kissy-module

merge js