fix bug 549054 - Adding more JS keywords to SyntaxHighlighter
fix bug 639384 -  White-less favicon
fix bug 731647 - Update CSS Ref Link
fix bug 739437 - Prevent duplicate thumbnail hover
fix bug 769516 - Add ?toc document option
fix bug 773054 - Allow S&CE on edits
Merge pull request #808 from darkwing/favicon-white-639384

fix bug 639384 -  White-less favicon
Merge pull request #807 from darkwing/syntax-keywords-549054

fix bug 549054 - Adding more JS keywords to SyntaxHighlighter
Merge pull request #809 from darkwing/css-ref-731647

fix bug 731647 - Update CSS Ref Link
Merge pull request #810 from darkwing/tooltip-739437

fix bug 739437 - Prevent duplicate thumbnail hover
Fix bug 826444: Disable "fullscreen" section editing.

Since we've decided the only way we want to support section editing is
through the inline AJAX-y edit, this disables the ability to do it
through any other kind of request, and updates the section-editing
unit tests to match that.
Merge pull request #812 from darkwing/had-and-save-773054

fix bug 773054 - Allow S&CE on edits
Fixing borked test
Move MindTouch redirects to be the last thing we put in urlpatterns.

This (hopefully) solves the issue several people have run into with
local dev instances, since in that setup the MT redirects conflict
with the local static-media patterns. Local instances don't actually
need those URLs, and production doesn't use the static-media patterns,
so switching the order should solve the problem.
Merge pull request #811 from darkwing/kumascript-769516

fix bug 769516 - Add $toc document option
Merge pull request #815 from ubernostrum/media-url-conflict

Move MindTouch redirects to be the last thing we put in urlpatterns.
Merge branch 'master' into section-edit-inline-only
Wrap error message in gettext.
Merge pull request #814 from ubernostrum/section-edit-inline-only

Fix bug 826444: Disable "fullscreen" section editing.