Resolved conflict

Merge changes that resolved the conflict between superfish and views_slideshow