add some rate limiting to the password reset functionality
Hide save/cancel buttons for native XBlocks in Studio
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
Fix password reset i18n
Embargo Middleware feature

Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
Django-admin for Embargo feature

Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.
Merge pull request #2741 from edx/sarina/update-translations

Fix password reset i18n
Add change for help modal in anticipation of i18n support
Tests for embargo middleware feature
Added discussions issue

to delete response comments
Merge pull request #2747 from edx/markhoeber/documentation/release-notes-update

Added discussions issue
Update schema for bok-choy database

Finalize tests for embargo middleware app
Students not receiving credit for peer assessment.
ORA-330
Merge pull request #2724 from edx/will/studio-xblock-save

Native XBlock Studio Save UI
fix method name to actually make sense
Merge pull request #2711 from edx/cdodge/throttle-forgot-password

add some rate limiting to the password reset functionality
Add new container page that can display nested xblocks

This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
Update video docs for multiple language transcripts
Merge pull request #2539 from edx/andya/nested-xblocks

Add new container page that can display nested xblocks
adding a little styling to the language note on the LMS help modal
Add xref to Add Files in Video docs