Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements