fix
Merge branch 'dev' of github.com:DamirDiz/ShoppingWars into dev
ItemFactory