Allow to override the default form field template (see #4547)
Support nested blocks in templates (see #6934)
Update the example website
Bump the version number
Fix two coding style issues