Carousel implemented
Merge branch 'carousel' into develop