bug fixies
Merge branch 'master' of https://github.com/prochka6/lab-eshop