adding custom img attrs to image_tags, but no custom TestCasecreated for it
typo
Merge branch 'feature/image_tag_attrs' of https://github.com/sixpearls/wagtail into sixpearls-feature/image_tag_attrs -
Update img_tag to output extra attributes through format_html_join rather than a template.
Conflicts:
	wagtail/wagtailimages/models.py
Refactor image tag parser so that it only has two cases to handle
Add unit test for image tag with extra attributes
Merge branch 'sixpearls-feature/image_tag_attrs'