Merge branch 'develop'
Merge branch 'develop'
Revert renaming of the logo.png file
Merge branch 'develop'
Merge remote-tracking branch 'origin/no-logo-rename'
Merge branch 'master' into develop