fix swatch slider, add a few new swatches
fix flexslider
fix conflict in navbar