Remove errors
Remove error

Conflicts:
	settings.py