omg conflict !
Merge branch 'develop' of https://github.com/le-phare/Atelier into develop

# By Philippe Roussille
# Via Philippe Roussille
* 'develop' of https://github.com/le-phare/Atelier:
  add conflict

Conflicts:
	pouet.php