Fix admin shops, fixes #267
Merge branch 'bugfix/adminSellShops' into develop