Merge origin/master

Conflicts:
	dao/utilisateur_dao.php
Merge origin/master

Conflicts:
	dao/utilisateur_dao.php
Merge origin/master

Conflicts:
	dao/Evaluation_DAO.php
	dao/Geolocalisation_DAO.php
	dao/commentaire_dao.php
	dao/etablissement_dao.php
	dao/lieu_dao.php
	dao/reclamation_dao.php
	parsing/Utilisateur_xmlparser.php
Merge origin/master

Conflicts:
	dao/Evaluation_DAO.php
	dao/Geolocalisation_DAO.php
	dao/commentaire_dao.php
	dao/etablissement_dao.php
	dao/lieu_dao.php
	dao/reclamation_dao.php
	parsing/Utilisateur_xmlparser.php