Update FlexSlider to allow for thumbnail navigation
Merge branch 'refs/heads/AdditionalOptions' into dev
Merge branch 'refs/heads/dev'