previous
Merge remote-tracking branch 'origin/master'

Conflicts:
	functionTest/carousel/carousel.js
	functionTest/widgets/carouselWidget.js
carousel autoplay fix completed
carousel clean up