Merge branch 'dev'
fix carousel css
Merge branch 'master' into dev