breadcrumb moved to an include and added on all page editor interfaces
Merge pull request #195 from davecranwell/master

breadcrumb moved to an include and added on all page editor interfaces
removed breadcrumb from move interface
Merge pull request #200 from davecranwell/master

removed breadcrumb from move interface
Removed patched treebeard from vendor folder
Updated wagtail to use treebeard 2.0
Pin django-taggit to 0.11.2
Django-taggit 0.12.x seems to break wagtail
Merge branch 'master' into treebeard-update

Conflicts:
	setup.py
Use Treebeard 2.0 add_child method
Add tox.ini for multi-version testing
add tox test environment for sqlite, and include elasticsearch
Python 2.6 compatibility - fixes #156
Merge branch 'master' into search-changes

Conflicts:
	wagtail/wagtailcore/query.py
Merge remote-tracking branch 'gasman/feature/tox' into search-changes

Conflicts:
	.travis.yml
	wagtail/wagtailsearch/backends/elasticsearch.py
	wagtail/wagtailsearch/indexed.py
	wagtail/wagtailsearch/tests/test_backends.py