Merge branch 'release/rc0.4'
Fixed margin for albums grid view
Merge branch 'hotfix/1' into develop