Merge pull request #260 from maciejlew/master

Adds layout template inheritance
Splits welcome html template into parts and prepares it for template inheritance system