Allow declaration of default block:

    {{#block 'my-block'}}
      default content
    {{/block}}

"default content" will be shown at the location of the block declaration if no `{{#contentFor 'my-block'}}` was provided.

It is still possible to have an empty block, just declare:

    {{#contentFor 'my-block'}}
    {{/contentFor}}
Merge branch 'feature/default-block'
Probably a merge problem
Merge branch 'fix/nested-layouts'