Merge branch 'logo'
Margin Fix
Merge branch 'master' into gh-pages