[MC] Salma merged conflicts
[MC] Salma fixed edit project
[MC] Salma merged more conflicts
[MC]
[WIP] Salma fixed the form view
[WIP] Salma arabized some error messages
[wIP] Salma fixed english view
[MC] Salma pulled the branch
[MC] Salma merged conflicts