First commit
Merge pull request #1 from webNeat/amine-dev

First commit
conflict fixed
Merge pull request #2 from webNeat/mohammed-dev

Mohammed dev
fixed