no message
Merge branch 'master' of https://github.com/lolozere/SalonSanteNature

Conflicts:
	footer.php
webdesign
Merge branch 'master' of https://github.com/lolozere/SalonSanteNature