Merge remote-tracking branch 'refs/remotes/upstream/nalanda-rct3' into develop

Conflicts:
	kalite/coachreports/tests/coachreport_tests.py
	kalite/control_panel/templates/control_panel/base.html
	kalite/control_panel/templates/control_panel/facility_management.html
	kalite/control_panel/templates/control_panel/zone_management.html
	kalite/control_panel/views.py
	kalite/distributed/static/css/distributed/khan-lite.css
	kalite/distributed/static/js/distributed/exercises/views.js
	kalite/distributed/tests/browser_tests/nalanda.py
	kalite/main/api_views.py
	kalite/testing/mixins/browser_mixins.py
	kalite/version.py