Merge pull request #515 from Turbo87/jinja

Added .jinja extension to HTML+Django language
samples: Added HTML samples
tokenizer: Added Jinja multiline comments {# ... #}
languages: Added .htm and .html extensions to HTML+Django language

If the classifier fails we will either get Jinja/Django templates with
pure HTML highlighting or HTML with Jinja/Django highlighting, which should
look identical to HTML highlighting.

The samples.json update was necessary to make the tests run properly.