Fix #270

Conflicts:
	testproject/testproject/settings/__init__.py