Merge pull request #41 from Infinity-3A3/Raed

Fixed Conflict with omar
removed main from ReclamationDAO
Merge pull request #43 from Infinity-3A3/Raed

Fixed Omar Conflict
Merge origin/master into Raed