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'
Fix for #1840: we expect 500 server errors to also return JSON messages

Conflicts:
	kalite/distributed/static/js/distributed/distributed-server.js
Change 'change password' button to 'edit account preferences.'

Conflicts:
	kalite/control_panel/templates/control_panel/account_management.html
Show username & points (optional) in sitepoints element; change navbar.

Conflicts:
	kalite/distributed/static/js/distributed/distributed-server.js
	kalite/distributed/templates/distributed/base.html
solve #1956: use decorator-specific wrapper/inner_fn

Conflicts:
	kalite/facility/decorators.py

Conflicts:
	kalite/facility/decorators.py
Fix for #1854: Change "mastery of topics" to "progress report"
Basic code for doing deletion stubs locally.  Will not propagate remotely.
Removing is_deletable code.
Remove need for add_syncing_models
Introduce (debug) settings to allow deletions and viewing of deleted objects.
Introduce all_objects manager, which will always return deleted (and not-deleted) objects.
Work-around for validation issue on save, where deleted foreign keys can't be found (they're hidden!)
Don't update userlog info by default--otherwise, programmatic Django save-related stuff fails (or becomes really hard to do generically).
Missed removing a reference to `is_deletable`
Test fixes.
Make # queries expected for admin login more flexible.
Move ka-lite app static libraries to static-libraries.