generation classes
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/META-INF/persistence.xml
	src/com/esprit/tunRecrut/dao/UserDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/entities/Candidature.java
	src/com/esprit/tunRecrut/entities/CandidaturePK.java
	src/com/esprit/tunRecrut/entities/Contrat.java
	src/com/esprit/tunRecrut/entities/Experience.java
	src/com/esprit/tunRecrut/entities/Metier.java
	src/com/esprit/tunRecrut/entities/Niveau.java
	src/com/esprit/tunRecrut/entities/Region.java
	src/com/esprit/tunRecrut/entities/TypeEmploi.java
	src/com/esprit/tunRecrut/entities/User.java
	src/com/esprit/tunRecrut/test/TestUser.java
	src/com/esprit/tunRecrut/util/MyDBConnection.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/META-INF/persistence.xml
	src/com/esprit/tunRecrut/dao/UserDAO.java
	src/com/esprit/tunRecrut/entities/Annonce.java
	src/com/esprit/tunRecrut/entities/Candidature.java
	src/com/esprit/tunRecrut/entities/CandidaturePK.java
	src/com/esprit/tunRecrut/entities/Contrat.java
	src/com/esprit/tunRecrut/entities/Experience.java
	src/com/esprit/tunRecrut/entities/Metier.java
	src/com/esprit/tunRecrut/entities/Niveau.java
	src/com/esprit/tunRecrut/entities/Region.java
	src/com/esprit/tunRecrut/entities/TypeEmploi.java
	src/com/esprit/tunRecrut/entities/User.java
	src/com/esprit/tunRecrut/test/TestUser.java
	src/com/esprit/tunRecrut/util/MyDBConnection.java
Merge origin/master

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