Merge branch 'master' into ashhilton
Grunt javascript and CSS build
reberge
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
Merge branch 'master' into submenus
Incomplete "mega dropdown"
Mega menus are go!
zip
setting for ajax cart
minor style tweaks