Allowing manual marking of devices that are for demo/testing purposes only, and display in the central server control panel.

Conflicts:
	kalite/control_panel/views.py
	kalite/templates/control_panel/zone_management.html
Merge branch 'release-central' of github.com:learningequality/ka-lite into release-central