Merge branch 'feature/kevin/email_notifications_panel' of…

Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel

lms/static/sass/_discussion.scss

@@ -825,7 +825,6 @@ body.discussion {
       z-index: 50;
       display: block;
       overflow: hidden;
-      padding-top: 10%;
       width: 100%;
       height: 100%;
       border: 1px solid transparent;

lms/templates/discussion/_underscore_templates.html

@@ -214,8 +214,8 @@
   <tr class="helpgrid-row helpgrid-row-notification">
   <td class="row-title">Receive updates</td>
   <td class="row-item-full" colspan="3">
+  <input type="checkbox" class="email-setting" name="email-notification"></input>
   <i class="icon icon-envelope"></i>
-  <span class="row-setting"><input type="checkbox" class = "email-notification" name="email-notification"></input></span>
   <span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
   </td>
   </tr>