Merge branch 'master' into submenus
Incomplete "mega dropdown"
Mega menus are go!
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
product tabs
zip
featured image on collection page
Merge pull request #167 from luciddesign/chateauboutique

Product tabs and collection featured image
Merge branch 'master' into ashhilton
Grunt compile