updates to category menu to hightlight the current category
Added haystack search
Merge branch 'feature/search'
Merge branch 'master' into feature/shop

Conflicts:
	lulzbot/templates/shop/base.html