Merge pull request #469 from edx/will/authoring/Rubric-GUI

Will/authoring/rubric gui