UserBean, ShopBean m.m.
Merge branch 'master' of https://github.com/valdahus/Grupp25.git