Test fix.
Fix for #1934: Title missing space in device management page.
Add hover text to help disambiguate language buttons.
Remove spaces from assignment.
Skip test in Python 2.6, as the wait function is failing and we're too busy to care.
Finally, a fix for this test!
Disable file-based updates vfor 0.12.0
Fix for #1800: for software updates, move updatesStart into ONLINE_ONLY case, so error message isn't cleared.

Conflicts:
	kalite/updates/static/js/updates/update_software.js
Cleanup of update_software: remove unnecessary callbacks, wrap strings in gettext/sprintf
Cleanup code to have consistent feel across files.

Conflicts:
	kalite/updates/static/js/updates/update_languages.js
	kalite/updates/static/js/updates/update_software.js
Add back callback to reboot.
Remove unused references to subtitle in css/js
check if we have the key of the central server first
always run collectstatic when we run kaserve
Merge branch 'nalanda-rct1' of github.com:learningequality/ka-lite into release-0.12.0
Change Django 1.4 for Django 1.5
Change django.conf.urls.default to django.conf.urls
Change {% url url_name to {% url 'url_name'
Merge branch 'develop' of github.com:learningequality/ka-lite into django-1.5

Conflicts:
	kalite/control_panel/templates/control_panel/account_management.html
	kalite/distributed/templates/distributed/base.html
	kalite/distributed/templates/distributed/exercise.html
	kalite/distributed/templates/distributed/homepage.html
Adding unmarked KA-LITE-MOD, tweaking # queries expected.