pikon
pikon
pikon
Merge origin/master

Conflicts:
	Pidev/src/pidev/dao/AnnonceDAO.java
	Pidev/src/pidev/presentation/Chiheb_Accueil.form
	Pidev/src/pidev/presentation/Chiheb_Accueil.java
	Pidev/src/pidev/presentation/Chiheb_Authentification.form
	Pidev/src/pidev/presentation/Chiheb_Authentification.java
	Pidev/src/pidev/presentation/Chiheb_Choix_Inscription.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Admin.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Admin.java
	Pidev/src/pidev/presentation/Chiheb_Espace_Client.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Client.java
	Pidev/src/pidev/presentation/Chiheb_Inscription_Responsable.form
	Pidev/src/pidev/presentation/pikon_gerer_proposition.java
Merge origin/master

Conflicts:
	Pidev/src/pidev/dao/AnnonceDAO.java
	Pidev/src/pidev/presentation/Chiheb_Accueil.form
	Pidev/src/pidev/presentation/Chiheb_Accueil.java
	Pidev/src/pidev/presentation/Chiheb_Authentification.form
	Pidev/src/pidev/presentation/Chiheb_Authentification.java
	Pidev/src/pidev/presentation/Chiheb_Choix_Inscription.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Admin.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Admin.java
	Pidev/src/pidev/presentation/Chiheb_Espace_Client.form
	Pidev/src/pidev/presentation/Chiheb_Espace_Client.java
	Pidev/src/pidev/presentation/Chiheb_Inscription_Responsable.form
	Pidev/src/pidev/presentation/pikon_gerer_proposition.java
AZEAZ
AZEAZ