Add/remove logos
Merge branch 'logo-swap'
Merge branch 'master' into cooked
updated