Olivier Massot 8bf8b622db various fixes 1 gadu atpakaļ
..
Layout e35a052b1c fix merge conflicts 1 gadu atpakaļ
Ui 8bf8b622db various fixes 1 gadu atpakaļ