Merge commit '9416443534231d77559ffef54323886802371add' into nalanda-rct1

Conflicts:
	ka-lite/kalite/distributed/tests/browser_tests/base.py
	ka-lite/kalite/distributed/tests/browser_tests/browser_tests.py
	ka-lite/kalite/testing/testrunner.py
	ka-lite/kalite/updates/tests/unicode_tests.py
	ka-lite/kalite/updates/videos.py
Fixing test error.
Adding main-specific setting for data directory, moving main data there.
Add I18N_DATA_PATH and directory to select locale/{lang_code}/LC_MESSAGES.
Fix bug--if dubbed_video_map is missing, English topic tree does not show.
Make an updates data path.
Removing outdated DATA_PATH from kalite/settings.py
Fixing json load error that I don't understand, removing old code.
Fixing import error.
Feeling sorry for @rtibbles, so debugging some of the many bugs that seem to exist on central server admin :(
Moving more middleware inclusions to be owned by app.
Merge commit '628bead0a716c23c3723ee985746bcc811bee1dd' into nalanda-rct1

Conflicts:
	ka-lite/kalite/control_panel/templates/control_panel/facility_management.html
	ka-lite/kalite/control_panel/views.py
	ka-lite/kalite/distributed/settings.py
	ka-lite/kalite/distributed/tests/browser_tests/base.py
	ka-lite/kalite/distributed/tests/browser_tests/browser_tests.py
	ka-lite/kalite/facility/settings.py
	ka-lite/kalite/i18n/__init__.py
	ka-lite/kalite/i18n/management/commands/update_po.py
	ka-lite/kalite/i18n/settings.py
	ka-lite/kalite/main/settings.py
	ka-lite/kalite/settings.py
	ka-lite/kalite/updates/management/commands/languagepackdownload.py
	ka-lite/kalite/updates/settings.py
	ka-lite/python-packages/securesync/settings.py
Fix bugs when editing zone on central server.
Merge branch 'nalanda-rct1' of github.com:learningequality/ka-lite into nalanda-rct11

Conflicts:
	kalite/control_panel/views.py
Use logging instead of sys.stdout for test output.