Merge pull request #351 from herby/snippets-fixes

Refactoring anAssociation out.
Fix the remains of old name HtmlSnippet.

Renaming was wrong, probably.
Merge pull request #352 from herby/snippets-fixes

Fix the remains of old name HtmlSnippet.