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

Will/authoring/rubric gui
Attempting to make our expand collapse experience the same as studios.
Merge pull request #477 from edx/grady/unify-expand-collapse

Unified our expand collapse to be in line with Studio's
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/reorder