ClientDAO/PrestDAO
Merge pull request #45 from Infinity-3A3/Raed

Fixed Conflict with Khaled
Merge pull request #46 from Infinity-3A3/Raed

Raed
Merge pull request #47 from Infinity-3A3/interface

ClientDAO/PrestDAO
Revert "interface qui contient la liste des todo pour l'admin"

This reverts commit f079ea89bd28a37524930518a10b0e6bb4168020.
Revert "Revert "interface qui contient la liste des todo pour l'admin""

This reverts commit 888d3771ad39ba83252652b67b719f06c3fe7231.
Revert "Revert "Revert "interface qui contient la liste des todo pour l'admin"""

This reverts commit e3864890e57977471e45d510c86e4a1f0894030a.
login + admin
Merge origin/karim_branche into Raed

Conflicts:
	nbproject/project.properties
	src/tn/mariages/dao/ClientDAO.java
	src/tn/mariages/dao/PrestataireDAO.java