Merge branch 'master' into chateauboutique
Grunt
hide collection if empty
theme setting for vendor display on product thumbnail
updated option select to include labels
conditional for 2nd call to action
assign product details div an id
zip
Merge
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
	theme/snippets/product-add-to-cart-form.liquid
Merge pull request #177 from luciddesign/chateauboutique

Hide empty collection description, 2nd CTA conditional, vendor on thumbnail