Conflicts:
	course/templates/course/file-upload-form.html
	course/templates/course/grade-flow-page.html