Merge pull request #168 from oa/master

Fixed the {% with %} template tag from htmldjango.snippets