stuff
ClientDAO/PrestDAO
Merge origin/cyrine_vers2 into Raed

Conflicts:
	nbproject/project.properties
Merge origin/master
Merge master into Raed