design panier
Merge branch 'master' of https://github.com/YvesKamdjo/cd-dev

Conflicts:
	templates/cashdressing/css/style.css
	templates/cashdressing/css/style_prep.css