Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php
Merge origin/master
Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php
Merge origin/master
Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php
Merge origin/master

Conflicts:
	dao/commentaire_dao.php
Merge origin/master

Conflicts:
	dao/commentaire_dao.php
Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php
	parsing/reclamation_xmlparser.php
	utilisateurs.php