troubleshooting urls.py
start with stock settings.py and urls.py
get settings.py and urls.py functional
Merge branch 'master' of github.com:KCJ/kcjplatform

Conflicts:
	kcj/kcj/urls.py