Merge pull request #168 from luciddesign/ashhilton

main product image size and collection featured image bug
Grunt
bring cart count back to top nav bar
zip
crossfade slider funtionality
Merge pull request #170 from luciddesign/blackenbrook

cart link in nav and crossfade slider
do not use collection image if it isn't defined
Merge branch 'master' into chateauboutique
Grunt
move collection description into own section
fix window width container
Sold out label
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
Grunt
Merge pull request #171 from luciddesign/chateauboutique

Featured Collection Image and Sold Out label
bottom margin for product variants
cart link in top nav
secondary call to action and product reviews
secondary call to action and crossfade slider settings
zip