Merge origin/master

Conflicts:
	connection/connection.php
	dao/Evaluation_DAO.php
	dao/Geolocalisation_DAO.php
	dao/commentaire_dao.php
	dao/domaine_dao.php
	dao/lieu_dao.php
	dao/reclamation_dao.php
	dao/utilisateur_dao.php
	entity/CommentaireEntity.php
	entity/UtilisateurEntity.php
	parsing/getXmlUtilisateur.php
	parsing/reclamation_xmlparser.php
	reclamations.php
Merge origin/master
Merge origin/master

Conflicts:
	connection/connection.php
	dao/Evaluation_DAO.php
	dao/Geolocalisation_DAO.php
	dao/commentaire_dao.php
	dao/domaine_dao.php
	dao/lieu_dao.php
	dao/reclamation_dao.php
	dao/utilisateur_dao.php
	entity/CommentaireEntity.php
	entity/UtilisateurEntity.php
	parsing/getXmlUtilisateur.php
	parsing/reclamation_xmlparser.php
	reclamations.php
Merge origin/master