small fixes of last merges
Merge branch 'feature-cart' of github.com:fairnopoly/fairnopoly into feature-cart