Update redirects from message, so user is brought to the appropriate page.
Merge pull request #991 from bcipolli/add_device_metadata

Add local device metadata to device management page
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into refactor_control_panel_context

Conflicts:
	kalite/control_panel/views.py
Merge branch 'refactor_control_panel_context' of github.com:bcipolli/ka-lite into refactor_control_panel_context
Merge pull request #995 from bcipolli/refactor_control_panel_context

Refactor control panel context
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into open_access_control_panel

Conflicts:
	kalite/control_panel/views.py
Merge pull request #996 from bcipolli/open_access_control_panel

Open access control panel
Merge pull request #998 from bcipolli/save_last_activity_time

Save last activity time
Merge pull request #1000 from bcipolli/better_install_redirects

Update redirects from message, so user is brought to the appropriate page
adding comments, prevent distributed server runs, linting
Only include i18n stuff if it's enabled.  Prevent central server from running distributed server command.
Exclude files from zipping procedure.
Make Django jsi18n into a fast, static file.
Redirect to original URL, if coming from *any* interesting page (i.e. NOT the homepage :) )
workaround for current bug in time-aware code
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into redirect_after_login
fixing template error, reordering offline choices, removing summary stats (no longer needed)
fixing template error, reordering offline choices, removing summary stats (no longer needed)
clean up code a bit
Remove duplicate messages, automatically clear errors if transient problem passes