Olivier Massot 411046ac32 fix merge conflicts 2 gadi atpakaļ
..
Layout 411046ac32 fix merge conflicts 2 gadi atpakaļ
Ui 411046ac32 fix merge conflicts 2 gadi atpakaļ