moved mbSlider to a separate directory
fixed conflict
fixed conflict
Merge branch 'dev'