header and sales module
delete
Merge branch 'master' of github.com:CompAndSave/Magento
yes
Conflicts:
	app/code/local/Compandsave/Productselector/controllers/PopupcartController.php