Merge branch 'master' into chateauboutique
grunt
product tabs
zip
featured image on collection page
Merge pull request #167 from luciddesign/chateauboutique

Product tabs and collection featured image