Merge pull request #12365 from edx/release-2016-05-03-conflict

Merging release 2016-05-03 into master

lms/static/sass/course/instructor/_instructor_2.scss

@@ -140,6 +140,7 @@
 // ====================
 .instructor-dashboard-content-2 {
   @extend .content;
+  display: block; // override the table-cell display set in .content
   width: 100%;
   padding: 40px;
 
@@ -2331,4 +2332,4 @@ input[name="subject"] {
     border: 1px solid $lightGrey1;
     cursor: not-allowed;
   }
-}
\ No newline at end of file
+}

lms/templates/static_pdfbook.html

@@ -3,7 +3,6 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
 <%block name="pagetitle">${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</%block>
-<%block name="nav_skip">#viewer-frame</%block>
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>