Add blocks to make template customization easier
Merge pull request #1004 from mbertheau/template-customization

Add blocks to make template customization easier