Updated wagtail (again)
Merge branch 'develop'

Conflicts:
	django-wagtail