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