add iCarosel
merge
fix bug