Conflicts:
	CHANGELOG.rst
	cms/djangoapps/contentstore/views/assets.py
	common/lib/xmodule/xmodule/css/combinedopenended/display.scss
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/peer_grading/peer_grading_problem.html