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

Conflicts:
	config/config.inc.php
	modules/dossiers/infos.php