Squashed 'ka-lite/' changes from 80cc253..cf08909

cf08909 Add flexibility in query tests.
3e133b1 Django 1.4 change: HttpRequest.raw_post_data was renamed to HttpRequest.body
198aff4 Merge branch 'release-0.12.0' of github.com:learningequality/ka-lite into HEAD
f5b5e1d Merge pull request #2011 from learningequality/ka-lite-central-merge
d8b707c Merge commit 'f6e4e64d4aa38d41fd90591096841ea209eecd22' into release-0.12.0
cadf011 Don't have a maximum number of syncsession records by default.
a5cd6bb Don't make an additional embedded query in deleting sync sessions.
027d1d3 add missing get_language_from_request import
7b2db7d Merge branch 'nalanda' into release-0.12.0
4868e26 Merge pull request #1992 from n-kim/hovereffects
3806a32 Fixes issue #1751
8de70cf force add the test language pack
a4e095e delete lock file if we encounter SIGHUP or SIGTERM
ac4f17d print out the port we are attempting to open
0a7579a catch the assertion error
df00bcf make delete_languagepack test pass
0cee0f5 fix update_languages.js
1e626f0 Merge pull request #1989 from jamalex/start.sh-setup
11db4bf Merge pull request #1990 from jamalex/softset-stats
402f412 Handle failures in setting copied script file permissions gracefully.
dfa61d7 Allow start.sh to be used to trigger automated setup via kaserve.
a6198dc Merge pull request #1987 from aronasorman/sshtunnel
4f4c4a4 remove tunnel.lock from gitignore
5422da4 sleep when we can't connect
08fd2c4 show the version according to git if we have a git repo!
9bbce9a display either the git or zip download update button depending on whether we're in a git repo
ee22302 Merge pull request #1980 from aronasorman/git-update
beb6d38 just show the dialog box when we complete or "cancel" the software update
192e61c update the remote url in case it changes
2f2010e place the lock file to the os's temp directory
d85ddb1 tunneling app and management command
255ea73 remove use of get_setting.sh
4fabee5 Merge pull request #1984 from rtibbles/control_panel_ui_fixes
8dbf433 Move ui-datepicker to shared stylesheet folder.
7fb5fb5 Update action button status when selecting 'all' or 'none' on facility management.
bc86f69 Only remove 'Ungrouped' group if empty.
acaaf15 Removed unneccessary semi-colon. First time ever.
cacdeab Activated no group browser test for facility management.
d62cee4 Fix for #1854: Change "mastery of topics" to "progress report"
a3d227b solve #1956: use decorator-specific wrapper/inner_fn
f036869 Show username & points (optional) in sitepoints element; change navbar.
0413880 Change 'change password' button to 'edit account preferences.'
ad6a812 Fix for #1840: we expect 500 server errors to also return JSON messages
ccde703 Fixes #1774 Action buttons start off disabled. When select event happens, check what is selected. Enable/disable accordingly.
aadf3de Merge pull request #131 from dylanjbarth/68
e7775c3 explicitly tell git to start searching for a git repo on the directory of update.py
0b1a7fe Adding jquery UI date picker css to fix calendar styling issue
1f290ea Fixes #1837 Remove Ungrouped group from group_data if empty and no other groups.
6e161c8 Fixed tests for user management.
418f241 Change {% url url_name to {% url 'url_name'
2dda9dd Change django.conf.urls.default to django.conf.urls
527805e Change Django 1.4 for Django 1.5
1775123 solve #1956: use decorator-specific wrapper/inner_fn
af09ca6 Merge pull request #1981 from aronasorman/1956
d33ab7b solve #1956: use decorator-specific wrapper/inner_fn
91912c5 make sure to refresh too if the update process gets "cancelled"
59560ba show the refresh page dialog box WHEN we get the 403 forbidden error
b561173 Almost done, damn tests
5a4eb4b check if remote_version is present in the data sent by the central server
ba410d3 abstract out download button behavior
ff8a130 indicate that we want a production run of the server on startup
1504927 dont forget to unpack the process
0cba679 also make a default value if dest_dir is not present
c130d46 dont self.current_dir if its not defined
b1fc0a5 Changed from icons to text.
58cd3ef stash stuff first before checking out
181848c catch the right git command error
6a1c567 fix local_setting detected for git update settings
10a3900 simplify git update process
6475b42 update git package
b8f2812 ignore TAGS file
5cb21c6 add settings for needed for updating through Git
bfb04c9 Fixing syntax error
5014be5 Don't duplicate, just wrap, facility template.
ef269a5 Merge pull request #124 from bcipolli/107
85adc7c Fixed styling crap on central control panel.
d9d4a34 Fix to fix on get_zone.
1be97c8 add button for updating through git
2aa56cc Fix UI code to properly hide/show on central server.
5532e4c Fix bug in get_zone--central server can set a zone before saving and signing.
daa35df Merge commit '37acd3bacf6aabaf6d81672f2614be9d61a52349' into release-0.12.0
e82c617 Merge branch 'nalanda-rct1' of github.com:learningequality/ka-lite into release-0.12.0
7b683ea always run collectstatic when we run kaserve
956b841 check if we have the key of the central server first
e860acd Remove unused references to subtitle in css/js
fc042b7 Add back callback to reboot.
0ddb19e Cleanup code to have consistent feel across files.
2d834b8 Cleanup of update_software: remove unnecessary callbacks, wrap strings in gettext/sprintf
5cf5c57 Fix for #1800: for software updates, move updatesStart into ONLINE_ONLY case, so error message isn't cleared.
5293bf0 Disable file-based updates vfor 0.12.0
f34a857 Finally, a fix for this test!
1d1ec4f Skip test in Python 2.6, as the wait function is failing and we're too busy to care.
2b57037 Remove spaces from assignment.
83da18b Fix for #107: scrub pot files for '%s' format strings.
529d8df Remove unsupported mplayer code.
43cd2cb Add hover text to help disambiguate language buttons.
1cc24e6 Fix for #1934: Title missing space in device management page.
c8fd50a Test fix.
2fe8704 Fix for #1917: Refactor markup and messages to separate URLs (completely) and markup code (partially) out of messages.
f2e3c3c Remove chronograph translations--they're essentially for the admin view.
4953d55 Change "zone" to "sharing network".
eff7d44 Fix up strings that break string compiling.
18238cb Fix test_wrappings filters sent to makemessages, tunnel verbosity
1b3e784 Fix up some small bugs (missing variables, functions)
9f5b1fc KA-LITE-MOD: tweak messages and search path to FIX DJANGO 1.4 BUGS
981e155 Separate template deletions, paths for commands.
c860e7e Rename update_po to test_wrappings, copy to update_pot witin centralserver.

git-subtree-dir: ka-lite
git-subtree-split: cf089092d5bbea11f93eb984e8966e55308900ce
Merge commit 'e823c234331bda5feada5e38aaf570ded735d632' into develop

Conflicts:
	ka-lite/kalite/control_panel/templates/control_panel/base.html
	ka-lite/kalite/control_panel/templates/control_panel/facility_management.html
	ka-lite/kalite/control_panel/templates/control_panel/zone_management.html
	ka-lite/kalite/distributed/templates/distributed/base.html
	ka-lite/python-packages/django/core/management/commands/makemessages.py
Change all {% url %} template tags to Django 1.5 style (quoted url names)
Remove deprecated imports that weren't being used anyway.
Properly annotate variables in localized string.
Converting Django 1.3-style code to Django 1.4+-style code.
Solving querytests issue.
Merge pull request #147 from bcipolli/django1.5

Pull in ka-lite:develop, including Django 1.5 changes