Fix for carousel widget option load
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	usr/module/widget/template/block/carousel/bootstrap.phtml
Wdiget carsouel update