updated docs with xdist instructions
2.5 version bump
updated copyright notice in the doc footer
travis: Django master
travis typo fix
Django 1.7 compatibility: Call django.setup() when available
Django 1.7: django.db.backends.util rename
Django 1.7: LiveServerThread updates
fixed live server regression
Django 1.7: Added comments about Django 1.7 compatibility
use short tracebacks
skip flaky xdist test on 3.2
Merge branch 'django17'
fixed invalid skipif
fixed typo in skipif
updated version, docs and readme to reflect django 1.7 support
Travis: skip mysql tests on python 3
Fix typo in changelog
Merge branch 'master' into fixturefix

Conflicts:
	pytest_django/plugin.py
cleanup of the admin_client fixture