some changes with carousel
Merge origin/master
some changes with Flipster