Merge remote-tracking branch 'remotes/origin/hechu1'

# Conflicts:
#	src/core/process/C_TeacherSearchStudent.java
#	web/jsFile/upload_action.js

src/core/process/Condition.java

@@ -3,7 +3,7 @@ package core.process;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Condition {//条件
+public class Condition {
     public List<Process> getProcesses() {
         return processes;
     }