Add hashed for shop password
Added image edit in deal
conflict resolved
Merge branch 'shop-area-version1' of https://github.com/gertu/gertu into deal-photo
Added upload image at create deal
Merge branch 'hashed-shop-password' into deal-photo
Merge branch 'deal-photo' into shop-area-version1

Merge deal-photo
Minor space fix