Olivier Massot e35a052b1c fix merge conflicts 8 mesiacov pred
..
Layout e35a052b1c fix merge conflicts 8 mesiacov pred
Ui e35a052b1c fix merge conflicts 8 mesiacov pred