Merge branch 'master' into ashhilton
Grunt javascript and CSS build
Re-indent
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
compiled ajax
footer script adjustments for ajax cart and collection thumb images
advanced layout cont.
indent and allow file uploads for line item properties
line items
Merge branch 'master' into ashhilton

Conflicts:
	Bootstrapify.zip
	theme/assets/affix.js
	theme/assets/carousel.js
	theme/assets/collapse.js
	theme/assets/modal.js
	theme/assets/popover.js
	theme/assets/scrollspy.js
	theme/assets/tab.js
	theme/assets/tooltip.js
	theme/assets/transition.js
	theme/snippets/advanced-layout.liquid