page livraison  model et vues
Merge branch 'master' of https://github.com/YvesKamdjo/cd-dev

Conflicts:
	components/com_cash_user/models/profiles.php
	components/com_cash_user/views/profiles/view.html.php
	templates/cashdressing/css/style.css