Olivier Massot e35a052b1c fix merge conflicts 1 gadu atpakaļ
..
Layout e35a052b1c fix merge conflicts 1 gadu atpakaļ
Ui e35a052b1c fix merge conflicts 1 gadu atpakaļ