Updating ORA2 hash for hotfix August 5th, 2014
Merge pull request #4709 from edx/ora2/hotfix-2014-8-5

Updating ORA2 hash for hotfix August 5th, 2014
add space to table header
Implemented process_response method to clear requestcontext global variable in mako middleware.
LMS-6622
Request IFRAME API every time with https scheme.
Merge pull request #4718 from edx/cdodge/fix-visual-bug

add space to table header
Merge pull request #4719 from edx/waheed/lms6622-implemented-process-response-method-rc

Implemented process_response method to clear requestcontext global variable in mako middleware.
ORA2 hotfix 2014-08-06
Merge pull request #4722 from edx/will/ora2-hotfix-2014-08-06

ORA2 hotfix 2014-08-06
Replace unit page with the container page.

STUD-1754
New Publishing controls on Unit page.

STUD-1707
cleanup of unit, container, and xblock sass; added modules and layout sass; publishing states and actions on new unit
New publishing controls on unit page (continued)

STUD-1707
Fix whitespace problems in xblock string field editor.

Whitespace is now trimmed from input. If after trimming input is empty
(pure whitespace or the empty string), the field is not updated.
Adds warning when editing a container visible to students

styling for editing a live unit
Updates based on merge with master.
Displays the date, time, and username of the most recent save and publish

Conflicts:
	cms/djangoapps/contentstore/views/item.py
Removes unnecessary PUT after DELETE
Discard changes rewrite.

STUD-1860
Fix test that broke on rebase