corrections diverses

Signed-off-by: Jawher Jouini <jawher.jouini@esprit.tn>
bons plans
Signed-off-by: Jawher Jouini <jawher.jouini@esprit.tn>
push lkoll

Signed-off-by: Jawher Jouini <jawher.jouini@esprit.tn>
Merge branch 'master' of https://github.com/jawherjouini/JetSetMag

Conflicts:
	src/tn/esprit/projet/dao/MembreDAO.java
	src/tn/esprit/projet/dao/MembreDao.java