Prepared for shop
Added shop part
...
Merge branches 'master' and 'ShopBackend'