slider
Merge branch 'css' into slider_css