fix
Merge branch 'master' of https://github.com/ClementRoy/Gite-des-cimes

Conflicts:
	classes/sejour.class.php