enlever
Merge branch '1.1' of github.com:abelass/shop into 1.1

Conflicts:
	.project
merge
Merge branch '1.1' of github.com:abelass/shop into 1.1
nada
changement d'autorisation sous spip 3.0.10 le foormulaire inscrire client ne passait plus