Merge origin/master

Conflicts:
	nbproject/project.properties
	src/pidev/presentation/Detail_annonce.java
abdel baassét s3idéni
kimo_commit
kimo_commit2
Merge origin/master

Conflicts:
	src/pidev/presentation/Chiheb_Espace_Client.form
	src/pidev/presentation/Chiheb_Espace_Client.java
	src/pidev/presentation/Chiheb_Espace_Responsable.form
	src/pidev/presentation/Chiheb_Espace_Responsable.java
	src/pidev/presentation/Detail_annonce.form
	src/pidev/presentation/Detail_annonce.java
	src/pidev/presentation/Detail_annonce_admin.form
	src/pidev/presentation/Detail_annonce_admin.java