Merge branch 'master' into develop
case 2525 - Sorting option for the carousel items.
case 2525 - Author fix, as well as some indention.
case 2525 - Code review notes.
Merge branch 'case-2525' into develop
Merge remote-tracking branch 'origin/develop'