Revert "Merge branch 'master' of https://github.com/roni-itai/ShopYourWayApp2"

This reverts commit 8a42285c9161f7c3d2b5330fb209b7471faf15f5, reversing
changes made to d3adeb1221a2d0c9955756f78b6a86bddadb82c8.
Revert "Revert "Merge branch 'master' of https://github.com/roni-itai/ShopYourWayApp2""

This reverts commit cfee707f70de801a6c8df7594118d0a7ea45b1c6.
Hope thuis doesnt mess anything up