Merge branch 'hotfix/img-width'
More CSS fixes
Merge branch 'refs/heads/master' into develop