Merge upstream ka-lite into ka-lite-central to get securesync hotfixes
Set zone_fallback for FacilityUser and FacilityGroup on central save.

Including TESTS!
Fix to get_zone for FacilityGroup.
Changed get_zone() to zone_fallback in test, for consistency.
Fix wording on setup.py help text.
Merge commit 'ba4b967e23e8150adbe6c0c62d0d846c8c3d2e3a' into ecosystem

Conflicts:
	ka-lite/data/content/topics.json
	ka-lite/kalite/coachreports/management/commands/generaterealdata.py
	ka-lite/kalite/coachreports/templates/coachreports/base_d3_visualization.html
	ka-lite/kalite/control_panel/static/js/control_panel/facility_management.js
	ka-lite/kalite/control_panel/templates/control_panel/base.html
	ka-lite/kalite/control_panel/templates/control_panel/facility_management.html
	ka-lite/kalite/control_panel/templates/control_panel/zone_management.html
	ka-lite/kalite/control_panel/urls.py
	ka-lite/kalite/distributed/api_urls.py
	ka-lite/kalite/distributed/settings.py
	ka-lite/kalite/distributed/static/js/distributed/distributed-server.js
	ka-lite/kalite/distributed/templates/distributed/base.html
	ka-lite/kalite/distributed/tests/browser_tests/query_tests.py
	ka-lite/kalite/facility/api_views.py
	ka-lite/kalite/facility/forms.py
	ka-lite/kalite/facility/models.py
	ka-lite/kalite/facility/templates/facility/facility_group.html
	ka-lite/kalite/facility/templates/facility/facility_user.html
	ka-lite/kalite/facility/tests/form_tests.py
	ka-lite/kalite/i18n/management/commands/test_wrappings.py
	ka-lite/kalite/i18n/settings.py
	ka-lite/kalite/i18n/tests/integration_tests.py
	ka-lite/kalite/main/api_views.py
	ka-lite/kalite/main/data/topics.json
	ka-lite/kalite/remoteadmin/management/commands/createtunnel.py
	ka-lite/kalite/settings.py
	ka-lite/kalite/testing/browser.py
	ka-lite/kalite/testing/settings.py
	ka-lite/kalite/topic_tools/__init__.py
	ka-lite/kalite/topic_tools/data/topics.json
	ka-lite/kalite/updates/__init__.py
	ka-lite/kalite/updates/api_views.py
	ka-lite/kalite/updates/data/video_file_sizes.json
	ka-lite/kalite/updates/templates/updates/base.html
	ka-lite/python-packages/django/core/management/commands/makemessages.py
	ka-lite/python-packages/securesync/engine/api_views.py
	ka-lite/python-packages/securesync/engine/models.py
	ka-lite/python-packages/securesync/tests/crypto_tests.py
Merge branch 'develop' into ecosystem

Conflicts:
	ka-lite/kalite/updates/api_views.py
Add a management command to read model object given it's primary key
Added a management command for creating a model. This is for test purposes only.
Merge remote-tracking branch 'upstream/ecosystem' into ecosystem
Refactored the model resolution into a new function residing in __init__.py
Merge pull request #162 from mashuq05/ecosystem

Add a management command to read model object given it's primary key
Merge pull request #161 from amshali/ecosystem

Added a management command for creating a model. This is for test purpos...
Update readmodel.py to use resolve_model function, and remove duplicated code.
Added some tests for createmodel.py
fix naming of variables in call_outside_command_with_output
Fix to our JSON serializer to prevent error ('first' attribute missing).
Merge branch 'ecosystem' of github.com:fle-internal/ka-lite-central into ecosystem
Merge pull request #164 from amshali/ecosystem

Added some tests for createmodel.py
Merge remote-tracking branch 'upstream/ecosystem' into ecosystem