Merge branch 'master' into chateauboutique
Merge branch 'master' into chateauboutique
Grunt
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
grunt zip
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
Merge branch 'master' of https://github.com/luciddesign/bootstrapify

Conflicts:
	Bootstrapify.zip
	theme/snippets/product-loop.liquid
Small tweaks and fixes
Fix features loop and tidy up a couple things
Add new append-plus-taxes-to-price setting

Makes it easy to add “ + taxes” to prices
Merge branch 'master' of https://github.com/luciddesign/bootstrapify

Conflicts:
	Bootstrapify.zip
	theme/snippets/product-price.liquid
Small design tweak for + taxes