Display an image response in the course staff debug page
Small developer doc formatting fixup
Merge pull request #584 from edx/will/image-staff-debug

Display an image response in the course staff debug page
Merge pull request #587 from edx/will/small-doc-fixup

Small developer doc formatting fixup
Update i18n messages
Merge pull request #588 from edx/will/i18n-syncup

Update i18n messages
Be even more flexible about boto
Increases flexibility about boto to 2.13 as minimum version, rather than 2.30
Merge pull request #590 from edx/grady/boto-version-fix

Increases flexibility about boto to 2.13 as minimum version, rather than...
Merge pull request #589 from singingwolfboy/any-boto-will-do

Be even more flexible about boto
Reverting scipy, boto, and ease versions
Fixed ORA-767, along with a number of small issues the tests brought up
Merge pull request #591 from edx/sanchez/revert-scipy-req

Reverting scipy, boto, and ease versions
Merge pull request #581 from edx/grady/ORA-767

Fixes ORA 767
Fix 500 error on progress page with rubric that has 0 points
Merge pull request #595 from edx/will/ora-780

Fix 500 error on progress page with rubric that has 0 points
Merge branch 'master' into authoring

Conflicts:
	openassessment/xblock/staff_info_mixin.py
Skip validation for assessment views that are disabled
Merge pull request #596 from edx/will/ora-782

Skip validation for assessment views that are disabled
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/OAR-771

Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js