Pre Merge
Merge branch 'master' of https://github.com/heshamhossam/smart-hypermarket.git