import error
Merge remote-tracking branch 'origin/update_kalite' into central_server_stats
fixing type-o on Linux/Mac, suppressing warnings
Merge branch 'update_kalite' into central_server_stats
fixed case error; moving out of main b/c main not always installed.  As long as kalite is in installed apps, we're good.
Merge branch 'update_kalite' into central_server_stats

Conflicts:
	kalite/settings.py
Make sure to call merge=True, to avoid any trouble.
Merge branch 'update_kalite' into central_server_stats
Merge branch 'central_server_stats' into IDOC_demo

Conflicts:
	kalite/main/tests/loadtesting/models.py
	kalite/main/tests/loadtesting/tests.py
	kalite/main/tests/loadtesting/urls.py
	kalite/main/tests/loadtesting/views.py