Merge branch 'master' into chateauboutique
Merge branch 'master' into chateauboutique
Grunt
merge in master and rebuild
Ensure any preexisting zoom instance is destroyed before recreating.
Merge pull request #183 from gavinballard/destroyzoom

Ensure any preexisting zoom instance is destroyed before recreating.
make sure we dont use sass vars if they are not defined yet; fixes #184
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
grunt zip
Fix issue with image padding when brand in navbar
Rename _footer-columns to footer-column-loop
single or multiple tag filters
percentage off or 'on sale' badge conditionals
settings for percentage off and tag filters
zip
form input width adjustments
Merge branch 'master' into chateauboutique

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

Tag Filter and On Sale/Percentage Discount theme settngs
Increase spacing between dropdown items
Add "was" pricing back to product loop