added carousel
some tiny changes
Merge branch 'dev'