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