Modifs Manon
Merge branch 'master' of https://github.com/NicolasMura/SITEatou

Conflicts:
	mobile/css/stylesSmart.css