moving api urls from url to api_urls, like in main.  Separating translatable strings
removing debug code, adding code comment
when retrypurgatory fails, it should output to stderr.  also adding a few more translatable strings
Merge branch 'api_url' of github.com:bcipolli/ka-lite into api_url
moving urls into main and central.  the small duplicated code is more than OK--it should be by design; there's no reason to force the two to use the same URL scheme.
removing cruft that was causing a view resolve exception
STATIC_URL should be used for static files; MEDIA_URL for user-uploaded files.  Django throws an error if they are the same.

See :
http://stackoverflow.com/questions/8531134/django-1-3-media-url-vs-static-url
https://docs.djangoproject.com/en/dev/howto/static-files/deployment/
Merge remote-tracking branch 'origin/urls' into api_url

Conflicts:
	kalite/settings.py
	kalite/urls.py
when we're the central server, don't EVER reference CENTRAL_SERVER_HOST--grab it from the actual request/site info
removing test file; i didn't mean to submit these changes here, and this test file is a dummy anyway
Merge remote-tracking branch 'origin' into api_url
missed adding 'load staticfiles' to one file
Merge remote-tracking branch 'upstream/develop' into api_url

Conflicts:
	kalite/settings.py
made non-use of settings.CENTRAL_SERVER_HOST fall back to that value.
removing some ugettext refs; moving some imports in other places
fixing bug from previous checkin.  sigh.
fixed small bug; sometimes device metadata would never be created. Now, I force it right after devices are downloaded and created.
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