etat
Merge branch 'master' into florian

Conflicts:
	inc/etat.php

resolution conflit