add options to cronserver for memory profiling and garbage collection, to address github issue 111 (unbounded memory usage)
main changes didn't take :( in git
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into trying_cronserver_garbage_collection
Allowing manual marking of devices that are for demo/testing purposes only, and display in the central server control panel.
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into mark_demo_devices

Conflicts:
	kalite/control_panel/views.py
	kalite/templates/control_panel/zone_management.html
Merge remote-tracking branch 'origin/trying_cronserver_garbage_collection' into clickable-scripts
migrating to a more generic setup of scripts
migrating cron scripts to use manage.py
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into clickable-scripts
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into generic-cronserver
On login, don't forward to the student report for the Raspberry Pi
removing readline module, which chokes on Windows
fixing windows scripts
hiding button for downloading KA data, until we have the right computations behind it
updating tests for new exerciselog saving API interface
fixing central server tests
Bug fix, using proper methods for adding
Add tests, test procedures, fix misspellings
Adding in regression tests for #697
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into generic-cronserver