merge OwlCarrousel2

Merge when beta finishes