added slider
Merge branch 'dev'