added reset and undo buttons
Merge branch 'giulio/ice-stage' of github.com:edx/edx-platform into giulio/ice-stage

Conflicts:
	lms/templates/peer_grading/peer_grading_problem.html