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

# Conflicts:
#	GDMS.iml

src/core/process/C_TeacherFillTopicInformation.java

@@ -3,9 +3,6 @@ package core.process;
 import core.operation.FillInformation;
 import error.GExcptInit;
 
-import org.w3c.dom.Text;
-
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;