Merge branch 'master' into develop
DDBEASY-439 - Fixed showing of author in the list.
Merge branch 'DDBEASY-439' into develop
Merge branch 'develop'