[Fixing] Fixed conflicts
[MC]
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into Salma_Fix
Merge pull request #492 from MGhanem/Salma_Fix

[Fixing] Fixed conflicts