allow updating by switching to a branch
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into update_to_branch

Conflicts:
	kalite/management/commands/update.py
Removing merge marker
Update search to be more efficient, contain HTML labels, and go directly to the selected page on click.
Merge branch 'release-0.11' into update_to_branch
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into shiny_search

Conflicts:
	kalite/static/js/search_autocomplete.js
tweaks to give new KA URL, to deal with self-referential topic tree
topic tree update
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into khanload_update
Upload new search icons and delete unused images
Merge pull request #31 from wangguan59/search_icon

Upload new search icons and delete unused images
Rename filenames to be more consistent.
Update to include info about availability, and use new icons.  Store data in non-flat way, then explicitly flatten--didn't work out pretty, but could be future useful.
Blacklist the 3rd-8th grade curriculum; remove a pdb.
Update from previous checkin
Merge pull request #1049 from bcipolli/shiny_search

Update search to be more efficient, contain HTML labels, and go directly to the selected page on click.
Merge pull request #1041 from bcipolli/update_to_branch

allow updating by switching to a branch
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into khanload_update
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into update_language

Conflicts:
	kalite/updates/management/commands/classes.py
Merge branch 'update_language' into updates_template_updates