Resolved conflict with Sell Media
updated flexslider
Image title and caption interchanged
Merge branch 'origin/dev'