Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -154,10 +154,10 @@ class ShixunWorkModal extends Component{
 			this.props.showNotification(`请先选择分班`);
 			return
 		}
-		if(group_ids&&group_ids.length < 2){
-			this.props.showNotification(`有效作品数少于2个，无法查重`);
-			return
-		}
+		// if(group_ids&&group_ids.length < 2){
+		// 	this.props.showNotification(`有效作品数少于2个，无法查重`);
+		// 	return
+		// }
 
 		let url="/homework_commons/"+this.props.match.params.homeworkid+"/homework_code_repeat.json";
 		axios.post(url, {