allowed hosts setting
Merge branch 'master' into allowed-hosts

Conflicts:
	project_name/project_name/settings/local.py
cleanup
Merge pull request #2 from team-stroller/allowed-hosts

Allowed hosts