Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/master
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
es interfaces
Merge origin/olfa

Conflicts:
	nbproject/project.properties
	src/edu/esprit/gui/InterfaceAccueil.form
	src/edu/esprit/gui/InterfaceAccueil.java
	src/edu/esprit/gui/InterfaceAjoutCatégorie.form
	src/edu/esprit/gui/InterfaceAjoutCatégorie.java
	src/edu/esprit/gui/InterfaceAjoutDeal.form
	src/edu/esprit/gui/InterfaceAjoutDeal.java
	src/edu/esprit/gui/InterfaceAlerte.form
	src/edu/esprit/gui/InterfaceAlerte.java
	src/edu/esprit/gui/InterfaceConnexion.form
	src/edu/esprit/gui/InterfaceConnexion.java
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.form
	src/edu/esprit/gui/InterfaceEnvoyerVoucher.java
	src/edu/esprit/gui/InterfaceInscription.form
	src/edu/esprit/gui/InterfaceInscription.java
	src/edu/esprit/gui/InterfaceSupprimerClient.form
	src/edu/esprit/gui/InterfaceSupprimerClient.java
	src/edu/esprit/gui/InterfaceSupprimerDeal.form
	src/edu/esprit/gui/InterfaceSupprimerDeal.java
Merge origin/master into olfa
es interfaces
es interfaces