Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/controller/UserController.java
	src/com/esprit/tunRecrut/dao/UserDAO.java
Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/controller/UserController.java
	src/com/esprit/tunRecrut/dao/UserDAO.java
prepare model table
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/esprit/tunRecrut/controller/UserController.java
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/dao/UserDAO.java
	src/com/esprit/tunRecrut/ui/CandidatUI.form
	src/com/esprit/tunRecrut/ui/CandidatUI.java
	src/com/esprit/tunRecrut/ui/LoginUI.form
	src/com/esprit/tunRecrut/ui/LoginUI.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/esprit/tunRecrut/controller/UserController.java
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/dao/UserDAO.java
	src/com/esprit/tunRecrut/ui/CandidatUI.form
	src/com/esprit/tunRecrut/ui/CandidatUI.java
	src/com/esprit/tunRecrut/ui/LoginUI.form
	src/com/esprit/tunRecrut/ui/LoginUI.java
Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
adding buttons send candidature and save as pdf
Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/ui/RegisterUI.form
	src/com/esprit/tunRecrut/ui/RegisterUI.java
Merge origin/master

Conflicts:
	src/com/esprit/tunRecrut/dao/AnnonceDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/ui/RegisterUI.form
	src/com/esprit/tunRecrut/ui/RegisterUI.java