Olivier Massot ba969bee68 fix conflicts 1 gadu atpakaļ
..
Layout ba969bee68 fix conflicts 1 gadu atpakaļ
Ui ba969bee68 fix conflicts 1 gadu atpakaļ