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 with 0.10, add support for recording language.
setting language properly on all request
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
fixing windows scripts
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into generic-cronserver
Merge branch 'generic-cronserver' of github.com:bcipolli/ka-lite into generic-cronserver
fixing cronserver, missed changes to uninstall, remove REM'd @echo off 's
set flag so force garbage collection OFF
form element only appearing when selected.  I don't know why, I don't particularly care.  Here's a very safe fix\!
second bug fixed.  better comments are in the fix that's in develop.
Merge pull request #701 from bcipolli/contact_form_fix

fix for #700