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

[Fixing] Fixed populate