Merge branch 'develop'
Merge branch 'develop'
code format
handle conflict
change demo js
set offset origin value
set offset origin value
Merge branch 'develop' of github.com:xieyu33333/iSlider into develop
Merge pull request #120 from xieyu33333/develop

fix a bug: set offset origin value