Logo change
Fix logo
Merge branch 'master' into development