Add always_cohort_inline_discussions in course settings
Added Jasmine tests for always_cohort_inline_discussions.
Make SessionMiddleware Microsite aware
Do not escape HTML in verify/payment error messages
Merge pull request #4786 from aboudreault/inline-discusssion-cohorting

Add always_cohort_inline_discussions in course settings
Merge pull request #6396 from edx/will/ecom-848

ECOM-848: No Flash Detected Error; HTML rendering as text
HTML should not be i18ned
Merge pull request #6393 from edx/remove-useless-gettext

HTML should not be i18ned
Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware

Allow for Microsite middleware to change cookie domains
mattdrayer/entrance-exams: New Feature - Course Entrance Exams