Projet Gessimmo V7 commit de Salif
Merge branch 'sakina' of https://github.com/Gessimmo/ProjetGessimmo into sakina

Conflicts:
	src/conf/persistence.xml
	src/java/modele/dao/BienDao.java
	src/java/modele/dao/CompteDao.java
	src/java/modele/dao/FactoryDao.java
	src/java/modele/dao/IDao.java
	src/java/modele/dao/LocataireDao.java
	src/java/modele/dao/ProprietaireDao.java
	src/java/modele/dao/TypeBienDao.java
	src/java/modele/metier/AdresseProprietaire.java
	src/java/modele/metier/Bien.java
	src/java/modele/metier/Compte.java
	src/java/modele/metier/Locataire.java
	src/java/modele/metier/Proprietaire.java
	src/java/modele/metier/TypeBien.java
	src/java/modele/metier/TypeCompte.java
	src/java/services/FactoryService.java
	src/java/services/IService.java
	src/java/services/ServiceAdresseProprietaire.java
	src/java/services/ServiceBien.java
	src/java/services/ServiceCompte.java
	src/java/services/ServiceLocataire.java
	src/java/services/ServiceProprietaire.java
	src/java/services/ServiceTypeBien.java
	src/java/servlets/FileServlet.java
	src/java/servlets/GestionLocataire.java
	src/java/servlets/GestionServlet.java
	src/java/servlets/UserServlet.java
	src/java/utils/FonctionsUtiles.java
	src/java/utils/GenerationFiles.java
	src/java/utils/Message.java
	web/META-INF/context.xml
	web/META-INF/persistence.xml
	web/WEB-INF/web.xml
	web/index.jsp
	web/pages/biens.jsp
	web/pages/connection.jsp
	web/pages/dashbord.jsp
	web/pages/file.jsp
	web/pages/modification.jsp
Merge branch 'salif' of https://github.com/Gessimmo/ProjetGessimmo into sakina

Conflicts:
	src/conf/persistence.xml
	src/java/modele/dao/BienDao.java
	src/java/modele/dao/LocataireDao.java
	src/java/servlets/UserServlet.java
	web/pages/connection.jsp
Merge branch 'salif' of https://github.com/Gessimmo/ProjetGessimmo into sakina

Conflicts:
	src/conf/persistence.xml
	src/java/modele/dao/BienDao.java
	src/java/modele/dao/LocataireDao.java
	src/java/servlets/UserServlet.java
	web/pages/connection.jsp
sakina