zwhui 10a25fa42d Merge branch 'picture' into dev 2 gadi atpakaļ
..
cyksj 10a25fa42d Merge branch 'picture' into dev 2 gadi atpakaļ