merge
Merge branch 'master' of https://github.com/TenWing/EauVive

Conflicts:
	src/modele/GestionMaree.hpp
	src/modele/GestionStade.cpp
	src/modele/GestionStade.hpp
	src/modele/Vanne.cpp