remove redundant dependencies from test project
Merge branch 'master' into custom_user_model

Conflicts:
	runtests.py