Merge master changes for WOWSlider

Merge changes in master for WOWSlider into website_multi_image