Merge branch 'master' into ashhilton
Grunt javascript and CSS build
reberge
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
Merge pull request #165 from luciddesign/ashhilton

Ajax settings and product property line items
Merge branch 'submenus'
Merge branch 'master' of https://github.com/luciddesign/bootstrapify

Conflicts:
	Bootstrapify.zip
	theme/assets/_base.scss.liquid
Merge branch 'master' into chateauboutique
grunt