Added logo to page template
Added logo to article page template
Added margin to logo
Merge branch '7.x-1.x'