Conflicts: CHANGELOG.rst common/djangoapps/track/views.py common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
