Fixed a wide screen error where the rubric would not display properly
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-738

Conflicts:
	openassessment/xblock/static/css/openassessment.css
Merge pull request #550 from edx/grady/ORA-738

Fixed a wide screen error where the rubric would not display properly