Olivier Massot 411046ac32 fix merge conflicts 2 rokov pred
..
Layout 411046ac32 fix merge conflicts 2 rokov pred
Ui 411046ac32 fix merge conflicts 2 rokov pred