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
Wrapping strings in Central
Undo central edit and wrapping coach reports
Wrapping central and coach reports
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into shiny_search

Conflicts:
	kalite/static/js/search_autocomplete.js
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into release-0.11
edited contact and securesync
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
do not force conversion to list--it's inefficient.  Wrap some strings along the way to fix compile errors.
Wrapping a bunch more strings, fixing up a few existing, and generally creating mayhem.
Merge pull request #9 from bcipolli/wrap_strings

do not force conversion to list--it's inefficient.  Wrap some strings along the way to fix compile errors.
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.