Add missing mimetypes for xblock resources
Add mimetype additions in studio startup
Adding template tag to render the microsite favicon
Adding template tag to render microsite css_overrides_file
Fix i18n bug on Studio's Advanced Settings page

STUD-1955

HTML escaped localized text that was output to
JavaScript.
Merge pull request #4345 from edx/andy/fix-i18n-bug

Fix i18n bug on Studio's Advanced Settings page
Fix bug in inline discussion post creation

Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
Merge pull request #4350 from edx/gprice/for-154

Fix bug in inline discussion post creation
CMS Video Handout Tests
Merge pull request #4307 from edx/ammar/bok-choy-video-handout-tests

CMS Video Handout Tests
Make wiki links not look inactive
Merge pull request #3504 from edx/dcs/LMS-1308

Make wiki links not look inactive. Fixes LMS-1308
Release notes for 7-9-2014
Merge pull request #4352 from edx/release

Release
Merge pull request #4284 from edx/sylvia/docs/relnotes_7_2

Sylvia/docs/relnotes 7 2
Edits from Michele
Merge pull request #4312 from edx/ahodges/documentation/DOC158mslotke

Edits from Michele
Updated with UI changes in Studio and LMS, terminology
Merge pull request #4321 from edx/ahodges/documentation/FOR595

Updated with UI and terminology changes
Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki

Feature/fmo/microsite wiki