Update django-wiki revision
fixes MAT-4

Add error notification for XBlocks in Studio

Fix typo

Start documenting Staff Debug Info

Release and merge conflict resolution

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts.

[BLD-889]

Add change for help modal in anticipation of i18n support

Update video docs for multiple language transcripts

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.

add some rate limiting to the password reset functionality

Native XBlock Studio Save UI

ORA-330

Finalize tests for embargo middleware app

STUD-1273

Added discussions issue

to delete response comments

Fix password reset i18n

Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.

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.

Fix start-time functionality in the video player.

Add Studio client-side runtime notifications for saving/cancelling XBlock edits.

Release Notes for 2-26-14

DOC-36

add new feature to make sure we aren't writing PII into the application ...

Improve UX of pinning feature