fix bug 769516 - Add ?toc document option
fix bug 773054 - Allow S&CE on edits
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.