Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

Fix my name in AUTHORS file

Jonahstanley/firefox acceptance tests

adjustment to sidebar help text on PDF textbook page in studio

Added comment

Removed set_trace

Removed set traces

Fixed display-name bug and added in a function to trigger events on firefox as well as check if it is firefox