Sync related commit
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket.git
Sync minor changes
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket.git
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket.git