Merge remote-tracking branch 'upstream/develop' into api_url
don't need to use Django static serving, as cherrypiserver sits in front.  This wasn't working for the start.sh script...
Merge branch 'api_url' of github.com:bcipolli/ka-lite into api_url
parceling out urls.py into main and central apps, making sure that 404 and 500 handlers work\!
Merge branch 'api_url' into IDOC_demo

Conflicts:
	kalite/central/views.py
	kalite/settings.py
	kalite/urls.py