Pour Georges: index.php?option=com_cash_user&view=cart&task=displ_addr&layout=default
Merge branch 'master' of https://github.com/YvesKamdjo/cd-dev

Conflicts:
	components/com_cash_user/views/profiles/tmpl/compte.php