Merge branch 'master' into jkantor/conflictError

src/App.scss

@@ -10,6 +10,7 @@ $fa-font-path: "~font-awesome/fonts";
 $input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.0.0 to work
 
 @import "~@edx/frontend-component-footer/dist/_footer";
+@import "~@edx/frontend-component-header/dist/index";
 
 #root {
   display: flex;

src/containers/ReviewModal/ReviewModal.scss

@@ -5,10 +5,8 @@
   overflow: auto !important;
   padding: inherit;
 
-  & > div.pgn__modal-body-content {
-    .row {
-      height: 100%;
-    }
+  & > div.pgn__modal-body-content .row {
+    height: 100%;
   }
 
   .content-block {
@@ -39,4 +37,4 @@
       width: 100%;
     }
   }
-}
+}