Merge branch 'develop' of github.com:learningequality/ka-lite into online_kalite_develop
Merge branch 'develop' of github.com:learningequality/ka-lite into online_kalite_develop
distributed servers do not have access to sync sessions from other distributed servers.  So don't suggest we know something about them in the zone_management page.

Conflicts:
	kalite/control_panel/views.py
Merge branch 'online_kalite_develop' of github.com:bcipolli/ka-lite into online_kalite_develop
distributed server side: new design (lie to clients about SUPERZONE device zones)