Conflicts: apps/openassessment/assessment/peer_api.py apps/openassessment/assessment/test/test_peer.py apps/openassessment/xblock/test/test_peer.py