Conflicts:
	.gitignore
	apps/openassessment/xblock/static/js/openassessment.min.js
	openassessment/assessment/test/test_models.py