Updated django-admin-smoke-tests version.
Merge branch 'master' into issue-6

Conflicts:
	setup.py