Merge pull request #529 from edx/grady/rubric-validation-event-handler

Validation and Dynamic Updates of Training Examples
Fixes the Bleed through of the Submission box Resize Handle by increasing the Z score of the modal which it was bleeding through.
Update templates so zero option criteria do not render in examples
Merge pull request #535 from edx/sanchez/zero-option-examples

Update templates so zero option criteria do not render in examples
Un highlight invalidated example options on edit
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-resize-bleed-through

Conflicts:
	openassessment/xblock/static/css/openassessment.css
Merge pull request #537 from edx/sanchez/unhighlight-selected-options

Un highlight invalidated example options on edit
Merge pull request #533 from edx/grady/fix-resize-bleed-through

Grady/fix resize bleed through
Updating the alerts in the rubric authoring.