Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/ui/OffreShowUI.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/ui/OffreShowUI.java