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
use logging.error / logging.warn in appropriate places, instead of logging.debug
Fix fontawesome path for production
Merge branch 'master' of github.com:learningequality/ka-lite into mark_demo_devices
Merge pull request #715 from arnaudbenard/fontawesome-fix

Fix fontawesome path for production
removing merge conflict marker
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into mark_demo_devices
Merge pull request #672 from bcipolli/mark_demo_devices

Allowing manual marking of devices that are for demo/testing purposes only
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
Fixing typo on the landing page..
Merge branch 'release-central' of github.com:learningequality/ka-lite into release-central
Move summary page to stats app.  Modify to show most recent updates (more useful), with links opening in new windows (avoid requerying) and links to device sync history.
tweaking devices page, to show metadata.  Add titles to pages with missing titles
re-enable KA download button
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into release-0.10
small fix to linux startup script
remove extra cr
Merge pull request #729 from gimick/serverstart_linux

Serverstart linux