Merge branch 'csvoss/test-grades' of github.com:edx/edx-platform into csvoss/test-grades

Conflicts:
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/tests/test_grades.py