6ta izmena
Merge branch 'master' into develop
7ma izmena
Merge branch 'develop'