adding custom img attrs to image_tags, but no custom TestCasecreated for it
typo
get_page_types no longer required in wagtailadmin.views.pages
Check that the content type passed to wagtailadmin.pages.create is valid according to subpage_types
Make can_add_subpage and can_publish_subpage permission checks return False for page models that disallow subpages; this ensures that 'add child page' links are not shown
Bypass 'choose a page type' screen when there is only one available choice in subpage_types
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'
changelog entry for #294
Update frontenddevelopers.rst

Added notes about new image manipulation techniques
Update frontenddevelopers.rst

heading level fix
Update frontenddevelopers.rst
Update frontenddevelopers.rst

typo fix
Revert frame-writing stuff from #315, as it fails when the preview loads before the placeholder - see https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595
Merge branch 'master' of github.com:torchbox/wagtail
Added a new hook to add new element rules to the Whitelister.
Add unit tests for DbWhitelister, including ability to override the whitelist via hooks
Move construct_whitelister_element_rules hook logic into DbWhitelister, as the whitelist module should be Wagtail-agnostic