Merge branch 'master' into feature/diana/rubric-input

Conflicts:
	common/lib/capa/capa/inputtypes.py

lms/djangoapps/open_ended_grading/grading_service.py

@@ -62,6 +62,7 @@ class GradingService(object):
         """
         Make a get request to the grading controller
         """
+        log.debug(params)
         op = lambda: self.session.get(url,
                                       allow_redirects=allow_redirects,
                                       params=params)

lms/djangoapps/open_ended_grading/peer_grading_service.py

@@ -81,7 +81,7 @@ class PeerGradingService(GradingService):
         self.get_problem_list_url = self.url + '/get_problem_list/'
 
     def get_next_submission(self, problem_location, grader_id):
-        response = self.get(self.get_next_submission_url, False, 
+        response = self.get(self.get_next_submission_url,
                 {'location': problem_location, 'grader_id': grader_id})
         return response