partial fix to video problem
a few test fixes, and one bugfix
Merge branch 'release-0.11' into multiple_srts
Fixing bug--sometimes context processors CAN be called before middleware!
Fixing 3 bugs and a bunch of tests.
More test changes, no bugs fixed.
Updating query tests to reflect the 'state of the art'
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into refactor_main
Updating tests, bringing bugfix from a downstream branch back here.
Merge branch 'refactor_main' of github.com:bcipolli/ka-lite into multiple_srts

Conflicts:
	kalite/i18n/custom_context_processors.py