hakim v0.3 chiheb
Merge origin/master
Merge origin/master
hakim v1.3
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/pidev/presentation/Detail_annonce.java