Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule

cms/.coveragerc

@@ -2,7 +2,7 @@
 [run]
 data_file = reports/cms/.coverage
 source = cms,common/djangoapps
-omit = cms/envs/*, cms/manage.py
+omit = cms/envs/*, cms/manage.py, common/djangoapps/*/migrations/*
 
 [report]
 ignore_errors = True

common/lib/xmodule/xmodule/css/html/display.scss

@@ -49,10 +49,18 @@ p {
 
 em, i {
   font-style: italic;
+
+  span {
+    font-style: italic;
+  }
 }
 
 strong, b {
   font-weight: bold;
+
+  span {
+    font-weight: bold;
+  }
 }
 
 p + p, ul + p, ol + p {

lms/.coveragerc

@@ -2,7 +2,7 @@
 [run]
 data_file = reports/lms/.coverage
 source = lms,common/djangoapps
-omit = lms/envs/*
+omit = lms/envs/*, lms/djangoapps/portal/*, lms/djangoapps/terrain/*, common/djangoapps/*/migrations/*
 
 [report]
 ignore_errors = True

lms/djangoapps/instructor/views.py

@@ -413,7 +413,7 @@ def instructor_dashboard(request, course_id):
             smdat = StudentModule.objects.filter(course_id=course_id,
                                                  module_state_key=module_state_key)
             smdat = smdat.order_by('student')
-            msg+="Found module to reset.  "
+            msg += "Found %d records to dump " % len(smdat)
         except Exception as err:
             msg+="<font color='red'>Couldn't find module with that urlname.  </font>"
             msg += "<pre>%s</pre>" % escape(err)