test branching
Added filterbar and redefine search button
Added add-to-cart panel
refactor
Merge remote-tracking branch 'origin/master' into
checkoutAndFilterSidebar

Conflicts:
	work/branding/branding.html
	work/branding/css/main.css
Try merging back to master