Replace "edX Studio" with "{studio_name}"

For theming and internationalization
Refactor sock HTML to have text in Mako template
only display the count for coupon redemptions that actually went through to purchase completion
Use STUDIO_SHORT_NAME for Studio

STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME
Merge pull request #6309 from edx/db/edx-studio-as-format-string

Replace "edX Studio" with "{studio_name}"
Revert #6192. It was causing a JS error on devstack.

TNL-1070
Merge pull request #6366 from edx/christina/fix-editing-bug

Revert #6192. It was causing a JS error on devstack.
Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons

[WL-186] only display the count for coupon redemptions that actually went through...
Improve i18n for courseware page
Better i18n for credit card charge failures
Revert "Better i18n for credit card charge failures"

This reverts commit 619a5ea3eb239fd561af0bbd30ed10af071e3d7d.
Merge pull request #6382 from edx/zoldak/fix-master

Revert "Better i18n for credit card charge failures"
Merge pull request #6379 from edx/improve-i18n-courseware-page

Improve i18n for courseware page

Merging from an airplane! w00t
Make SessionMiddleware Microsite aware