Merge branch 'master' into refactor
Fix Carousel slider
Merge branch 'refactor'