Conflicts:
	Makefile
	openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
	openassessment/templates/openassessmentblock/self/oa_self_assessment.html
	openassessment/xblock/data_conversion.py
	openassessment/xblock/grade_mixin.py
	openassessment/xblock/peer_assessment_mixin.py
	openassessment/xblock/self_assessment_mixin.py
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/src/oa_server.js
	openassessment/xblock/studio_mixin.py
	openassessment/xblock/xml.py