Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-resize-bleed-through

Conflicts:
	openassessment/xblock/static/css/openassessment.css

openassessment/templates/openassessmentblock/edit/oa_training_example.html

@@ -19,7 +19,9 @@
             <h2>{% trans "Scored Rubric" %}</h2>
             <ol class="openassessment_training_example_criteria_selections list-input settings-list">
                 {% for criterion in example.criteria %}
-                    {% include "openassessmentblock/edit/oa_training_example_criterion.html" with criterion=criterion %}
+                    {%  if criterion.options %}
+                        {% include "openassessmentblock/edit/oa_training_example_criterion.html" with criterion=criterion %}
+                    {% endif %}
                 {% endfor %}
             </ol>
         </div>

openassessment/xblock/static/js/src/studio/oa_rubric_events.js

@@ -245,11 +245,11 @@ OpenAssessment.StudentTrainingListener.prototype = {
             .children().first()
             .clone()
             .removeAttr('id')
-            .attr('data-criterion', data.name)
+            .attr('data-criterion', data.criterionName)
             .toggleClass('is--hidden', false)
             .appendTo(".openassessment_training_example_criteria_selections", view);
 
-        criterion.find(".openassessment_training_example_criterion_option").attr('data-criterion', data.name);
+        criterion.find(".openassessment_training_example_criterion_option").attr('data-criterion', data.criterionName);
         criterion.find(".openassessment_training_example_criterion_name_wrapper").text(data.label);
     }