fixing buggs in the packaging script, commenting
broken in the merge.. chose the wrong lines.  Oops\!
IE8 didn't like the array syntax (was converting to a string somewhere), so changed to object.
adding ordering (by name) to all objects queried out for display.
fix bugs, especially on WinXP
Total points only updated after save, added comments, simplified.
change from 'zone' to 'network'
Merge pull request #515 from jamalex/realtime_point_updating

Real-time updating of "total points" in top-right corner of screen.
Merge branch 'release-0.10' into mplayer_launcher

Conflicts:
	kalite/main/api_views.py
	kalite/main/views.py
	kalite/settings.py
	kalite/static/js/videoplayer.js
	kalite/templates/video.html
	kalite/utils/internet.py
Merge branch 'release-0.10' into develop
Merging with @wangguan59, tweaking some things
fix for an incorrect merge conflict resolution, pops up on distributed server only.
Fix link color issue.
Merge branch 'install_wizard_super' of github.com:bcipolli/ka-lite into install_wizard_super

Conflicts:
	kalite/main/views.py
Merge branch 'install_wizard_super' of github.com:bcipolli/ka-lite into install_wizard_beyond
Merge branch 'install_wizard_beyond' of github.com:bcipolli/ka-lite into install_wizard_beyond
removing buttons
Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into platform_specific_scripting
add .command files, for double-click in OSX.  Add run_command, for running management commands.
Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into install_wizard_beyond