Import unittest2 from Django
Have wagtaildocs, wagtailembeds, wagtailimages and wagtailsnippets register their page editor JS components through the insert_editor_js hook, rather than hard-coding them into _editor_js.html
Move chooserUrls definitions into their respective apps
Add mechanism for apps to register their own hallo.js plugins
Embeds: Catch TypeErrors when casting width and height to integers
Remove all (3) raw SQL statements. This will allow Django to generate the statements, so there aren't any backend issues
Merge branch 'tests-changes' of https://github.com/kaedroho/wagtail into kaedroho-tests-changes
Merge branch 'kaedroho-tests-changes'
Merge branch 'fix/remove_raw_sql' of https://github.com/sixpearls/wagtail into sixpearls-fix/remove_raw_sql
Add Ben Margolis to contributors
Merge branch 'sixpearls-fix/remove_raw_sql'
Remove dead code for creating pages by type and then location; it's been unused since wagtail 0.1, hasn't been updated for the page permission model, and needs further spec / discussion (including a working subpage_types implementation) before it can return
More robust image file validation
Previously, it was possible to upload PSD files by simply renaming them to have a '.jpg' extension.

This causes issues as wagtailimages cannot resize PSD files causing crashes.

This commit fixes this by validating that the internal format of the file matches the extension.
Merge pull request #252 from kaedroho/image-validation-fix

More robust image file validation
Reopen images for validation if they are closed
Merge branch 'image-validation-fix'
Revert "Reopen images for validation if they are closed"

This reverts commit 7d43b1cf6eda74c86209a4cae0d71557ce9bdbc0.
Don't check internal file formatl if image is closed
Merge branch 'master' into dj17

Conflicts:
	wagtail/tests/utils.py
	wagtail/wagtailadmin/tests.py
	wagtail/wagtailimages/models.py
	wagtail/wagtailsearch/tests/test_queries.py