user entity
Merge branch 'JeanClaude' into Development
Merge branch 'Benyam' into Development
Merge branch 'Development' into JeanClaude