Merge branch 'master' into lucid.co.nz
Merge branch 'master' into lucid.co.nz
(Hopefully!) smarter column-balancing of thumbs
Merge branch 'master' into lucid.co.nz

Conflicts:
	theme/templates/product.liquid
	theme/templates/product.portfolio.liquid
Merge branch 'master' into lucid.co.nz

Conflicts:
	theme/snippets/__thumbnail-span.liquid
	theme/templates/product.liquid
	theme/templates/product.portfolio.liquid
Merge pull request #163 from luciddesign/lucid.co.nz

Lucid.co.nz
Tidy up collection sort by drop down
Reflow navbar links
Re-indent
Merge branch 'master' into chateauboutique
advanced layout dev
zip
Re-indent
apply c_sum to collection only
zip
Merge pull request #164 from luciddesign/chateauboutique

apply c_sum to collection only
Bower and Grunt update
Navbar cart/account changes
Merge branch 'master' of https://github.com/luciddesign/bootstrapify

Conflicts:
	Bootstrapify.zip
Make one product full width if adaptive thumbs