minor correction in base.py and urls.py
minor correction in base.py and urls.py
Merge branch 'dev'

Conflicts:
	.c9/metadata/workspace/project_name/project_name/settings/base.py